Skip to content

upstream merge needs attention: v0.80.0 (QA_FAILED) #70

Description

@code-yeongyu

Automated upstream merge for v0.80.0 did not complete cleanly (result: QA_FAILED).

Agent report

Upstream Merge Report

Result

MERGE_RESULT: QA_FAILED

Upstream

  • Tag: v0.80.0
  • Upstream main SHA: 86528dd9ee8ada3a3e0e9d104f70e3bd6f74c184
  • Bot branch: automation/upstream-v0.80.0-28045202311
  • Reported at: 2026-06-23T18:22:56Z

Commits

  • ccb2da789 - merge: upstream v0.80.0
  • 76cc979ab - docs(changelog): audit upstream 86528dd9e
  • b91dcf06f - fix: restore upstream merge compatibility

Preserved Fork Work

The merge kept the fork branch history as the first parent and merged upstream/main
with a history-preserving --no-ff merge. Recent preserved fork commits include:

  • 9bcf682ab - Merge pull request #69 from code-yeongyu/code-yeongyu/qa-evidence-pr-readable
  • fad78be26 - docs: clarify PR evidence requirements
  • 6547a1a9f - Merge pull request #68 from code-yeongyu/code-yeongyu/permission-plugin-presets
  • 07b15835b - feat(coding-agent): add permission presets
  • d237fad43 - Merge pull request #67 from code-yeongyu/code-yeongyu/webfetch-human-like

Conflict Resolution

  • .github/upstream.json was updated to record v0.80.0, upstream SHA
    86528dd9ee8ada3a3e0e9d104f70e3bd6f74c184, and sync timestamp
    2026-06-23T17:57:04Z.
  • Fork-specific source files were merged semantically, preserving local behavior while
    adopting upstream changes where compatible.
  • Lockfiles were refreshed after dependency alignment.
  • @smithy/types was aligned to 4.14.2 in packages/ai and
    packages/coding-agent to satisfy the upstream Bedrock middleware type surface.
  • Follow-up compatibility work restored build/check compatibility after upstream moved
    provider implementations under packages/ai/src/api/*, including faux provider test
    hooks and /compat imports in legacy consumers.

No unresolved git conflict markers remain.

Changelog Audit

Entries were added under ## [Unreleased] only:

  • packages/ai/CHANGELOG.md
  • packages/agent/CHANGELOG.md
  • packages/coding-agent/CHANGELOG.md

No released changelog sections were edited during the audit commit.

QA

Passed:

  • npm run build
  • npm run check
  • node packages/coding-agent/dist/cli.js --version returned 2026.6.22
  • node packages/coding-agent/dist/cli.js --help
  • node .agents/skills/senpi-qa/scripts/lib/common.mjs --self-check
  • node .agents/skills/senpi-qa/scripts/mock-loop.mjs --self-test --evidence upstream-agent-mock-loop
  • node .agents/skills/senpi-qa/scripts/cli-smoke.mjs --self-test
  • node .agents/skills/senpi-qa/scripts/tui-smoke.mjs --self-test --driver tmux --evidence upstream-agent-tui

Evidence paths:

  • local-ignore/qa-evidence/20260623-upstream-agent-mock-loop/mock-loop.txt
  • local-ignore/qa-evidence/20260623-upstream-agent-cli-smoke/cli-smoke.txt
  • local-ignore/qa-evidence/20260623-upstream-agent-tui/tui-smoke-tmux.txt

Failed:

  • npm test

Failure summary:

  • packages/agent: 16 files passed, 176 tests passed.
  • packages/ai: failed with 56 tests. Remaining failures are concentrated in fork
    behavior that has not been fully reapplied to the upstream src/api/* provider split:
    Anthropic adaptive thinking and request metadata, Anthropic/Fireworks cache and tool
    compat, provider-native block replay/surfacing, Bedrock endpoint and reasoning replay,
    OpenAI Responses terminal/websocket behavior, OpenAI Completions tool choice/freeform
    guard behavior, Google provider-native blocks, Together reasoning metadata, and
    tool-call middleware routing.
  • packages/coding-agent: failed with 5 tests. Remaining failures are in branch
    summarization mock routing and built-in compaction threshold/speculative invalidation
    behavior.
  • packages/tui: passed 742 tests.

Conclusion

The branch is not PR-ready because npm test is red. Build, check, CLI smoke, and
credential-free senpi QA are green, so the remaining blocker is focused on restoring
the fork-specific provider and compaction semantics against the upstream v0.80.0
internal API layout.

Resolve manually, then re-run Upstream Agent Merge with force=true.

Metadata

Metadata

Assignees

No one assigned

    Labels

    sync-conflictAutomated upstream sync needs maintainer attention

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions