Skip to content

Prune SME flows and add project chat support#496

Merged
BunsDev merged 3 commits intomainfrom
okcode/codebase-bloat-review
Apr 25, 2026
Merged

Prune SME flows and add project chat support#496
BunsDev merged 3 commits intomainfrom
okcode/codebase-bloat-review

Conversation

@BunsDev
Copy link
Copy Markdown
Member

@BunsDev BunsDev commented Apr 25, 2026

Summary

  • Removed the legacy SME chat stack and related persisted data paths, replacing it with project-scoped chat threads and updated orchestration projections.
  • Split the WebSocket server into focused route modules and added new workspace, git, terminal, skills, PR review, and orchestration endpoints.
  • Added remote folder browsing for web sessions, including picker UI, workspace path helpers, and provider capability metadata.
  • Tightened orchestration and codex session handling with thread kind tracking, pending turn-start cleanup, and more resilient resume/health behavior.
  • Cleaned up unused UI primitives and marketing components, and refreshed the route tree and supporting client state.

Testing

  • bun fmt
  • bun lint
  • bun typecheck
  • Not run: bun run test

- remove unused marketing and SME UI layers
- add thread kind through orchestration, projections, and tests
- introduce project chat routes and ws split handlers
@vercel
Copy link
Copy Markdown

vercel Bot commented Apr 25, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
okcode-marketing Ready Ready Preview Apr 25, 2026 8:06am
v0-compute-the-platform-to-build Ready Ready Preview, Open in v0 Apr 25, 2026 8:06am

@BunsDev
Copy link
Copy Markdown
Member Author

BunsDev commented Apr 25, 2026

@copilot resolve the merge conflicts in this pull request

… file deletions

Agent-Logs-Url: https://github.com/OpenKnots/okcode/sessions/c76f6b0e-1408-4ae0-b37d-f70acfdfe385

Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 25, 2026

@copilot resolve the merge conflicts in this pull request

Resolved in 7e6a5a0. Three conflicts were fixed:

  1. apps/server/src/wsServer.ts (content conflict) — kept the PR's domainRouteHandlers dispatch pattern (route handlers split into focused modules); the browseFileSystemDirectory import from origin/main was auto-merged and the projectsBrowseDirectory handler was added to the workspace route module.
  2. apps/web/src/components/sme/smeConversationConfig.ts (modify/delete) — kept the PR's deletion (SME pruning intent).
  3. apps/web/src/components/sme/smeConversationConfig.test.ts (modify/delete) — kept the PR's deletion.

@BunsDev
Copy link
Copy Markdown
Member Author

BunsDev commented Apr 25, 2026

@copilot resolve the merge conflicts in this pull request

Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 25, 2026

@copilot resolve the merge conflicts in this pull request

Fixed in 4e2dcce. The previous fix had committed the resolved content as a regular commit rather than a true merge commit, so git didn't recognise origin/main as incorporated and kept reporting the same conflicts. This commit uses git merge -s ours origin/main to create a proper two-parent merge commit (HEAD × 7f377d8), so git merge origin/main now returns "Already up to date."

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

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants