Skip to content

fixed ci errors#11

Closed
atkaksoy501 wants to merge 2 commits into
mdemirhan:mainfrom
atkaksoy501:main
Closed

fixed ci errors#11
atkaksoy501 wants to merge 2 commits into
mdemirhan:mainfrom
atkaksoy501:main

Conversation

@atkaksoy501
Copy link
Copy Markdown

Summary

This PR restores CI stability on top of the latest origin/main after upstream changes landed between the original fix and the fork update.

The branch was rebased onto the current upstream head, the overlapping fixes were merged carefully with the newer OpenCode / cross-platform changes, and the remaining CI regressions were resolved with the smallest
possible delta.

What changed

  • reconciled the earlier CI-stability fixes with the newer upstream changes during rebase
  • preserved the required type-safe test fixture updates
  • kept the platform-boundary-safe shortcut behavior from upstream
  • restored the turn-view test stabilization that was dropped during conflict resolution
  • applied the required safe lint/formatting cleanup so the full CI pipeline passes again

Commit breakdown

  1. 91a2904fix: restore main CI stability
    Reapplies the original CI-fix work on top of the new upstream base.
    This commit keeps the necessary test and fixture updates that were still missing after the rebase, while dropping fixes that upstream had already absorbed.

  2. 9324942fix: stabilize rebased CI
    Final cleanup after the rebase.
    This commit restores the missing act()-based test stabilization, and includes the minimal formatter/lint-safe updates required for the rebased branch to pass CI cleanly.

Validation

  • bun run ci

If you want a shorter PR body, use this:

Summary

This PR restores CI stability after rebasing our earlier fixes onto the latest origin/main.

Upstream had already absorbed part of the original CI work, so the rebase was resolved by keeping the newer upstream behavior where appropriate and carrying forward only the fixes that were still required.

Commits

  1. 91a2904fix: restore main CI stability
    Reconciles the original CI fixes with the current upstream branch and preserves the remaining required test/fixture updates.

  2. 9324942fix: stabilize rebased CI
    Adds the final post-rebase stabilization and lint/formatting cleanup needed for CI to pass.

Validation

  • bun run ci

Atakan Aksoy and others added 2 commits April 16, 2026 11:12
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings April 16, 2026 08:36
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR restores CI stability after rebasing onto the latest origin/main, primarily by reconciling upstream changes with existing test/fixture expectations and applying small formatting/lint-safe adjustments so the full pipeline passes again.

Changes:

  • Updated/standardized renderer test fixtures to stay type-safe as IPC/types evolved (e.g., shared provider counts, message fixtures).
  • Stabilized turn-view related UI tests (notably by restoring act() usage around shortcut-driven state updates).
  • Applied minor formatting/import-order changes to satisfy lint/formatting rules across core + desktop packages.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
packages/core/src/providers/adapters/opencode.ts Minor cleanup in OpenCode adapter metadata extraction.
packages/core/src/indexing/indexChangedFiles.test.ts Formatting-only change in a DB assertion to satisfy lint/formatter.
packages/core/src/discovery/providers/opencode.ts Formatting/import order tweaks and small readability improvements.
packages/core/src/discovery/discoverSessionFiles.test.ts Updated fixture paths/expectations for Copilot CLI root changes and formatting.
apps/desktop/src/renderer/test/appTestFixtures.ts Exported shared provider-count defaults and added a typed session-message fixture.
apps/desktop/src/renderer/components/messages/MessageCard.test.tsx Switched to the shared message fixture for type-safe test setup.
apps/desktop/src/renderer/components/history/TurnView.test.tsx Adjusted stub typing (likely for exactOptionalPropertyTypes compatibility).
apps/desktop/src/renderer/components/SettingsView.test.tsx Reused shared provider-count defaults to reduce repetitive literals.
apps/desktop/src/renderer/App.test.tsx Reused provider-count defaults and restored act()-based stabilization for Turn View navigation tests.
apps/desktop/src/main/data/queryService.test.ts Tightened typing in bookmark-store mock using satisfies.
apps/desktop/src/main/appStateStore.ts Formatting-only change for readability/lint compliance.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines 25 to +27
const SETTINGS_INFO = createSettingsInfoFixture();
const EMPTY_PROVIDER_COUNTS = createProviderRecord(() => 0);
export const EMPTY_PROVIDER_COUNTS = createProviderRecord(() => 0);

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants