Skip to content

Merge EveryInc fork: Team support, mobile, and document features#139

Open
Ash-Blanc wants to merge 11 commits intoagno-agi:mainfrom
Ash-Blanc:main
Open

Merge EveryInc fork: Team support, mobile, and document features#139
Ash-Blanc wants to merge 11 commits intoagno-agi:mainfrom
Ash-Blanc:main

Conversation

@Ash-Blanc
Copy link
Copy Markdown

This PR merges multiple feature improvements from the EveryInc fork including:

Features

  • Team support and multi-user sessions
  • Mobile optimizations
  • Branch conversations
  • Load team sessions
  • Document support
  • Endpoint configuration improvements

Status

⚠️ Merge Conflicts Present - This PR has conflicts that need manual resolution

Conflicts to Resolve

Following the strategy from pair programming with Grok:

  1. Config Files Priority (High): package.json, tsconfig.json, next.config.js
  2. Library Files Priority (Medium): /lib and /utils with inter-feature dependencies
  3. UI Components (Low): /components and /app directories

Testing

After conflict resolution:

  • npm run build - Verify TypeScript compilation
  • npm run test - Run test suite
  • Manual testing of affected features

DannyAziz added 11 commits May 2, 2025 14:28
- Removed the `ComboboxTeam` type and replaced it with the `Team` type across relevant files.
- Updated API functions to directly return `Team[]` instead of transforming data into `ComboboxTeam[]`.
- Adjusted the `TeamSelector` component to use `team_id` and `name` directly from the `Team` type.
- Cleaned up unused state management for agent and team IDs in the AI stream handler.
@thanosshawn
Copy link
Copy Markdown

not good

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.

3 participants