Skip to content

Commit 83f58ee

Browse files
committed
Merge branch 'main' into fix/cpk-7155-thread-shared-state
Incorporates the V1/V2 flat package consolidation (96885b5). All our thread-isolation changes auto-merged to the new package paths. Three content conflicts resolved (import paths updated from @/ aliases to relative paths and @copilotkitnext/* to @copilotkit/*): - packages/react-core/src/v2/hooks/use-agent.tsx - packages/react-core/src/v2/hooks/use-render-custom-messages.tsx - packages/react-core/src/v2/components/chat/CopilotChatMessageView.tsx File location conflict resolved: use-agent-thread-isolation.test.tsx moved from packages/v2/react/... to packages/react-core/src/v2/...
2 parents f1da7a9 + ecf6747 commit 83f58ee

1,296 files changed

Lines changed: 45576 additions & 10209 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/config.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"commit": false,
55
"access": "public",
66
"baseBranch": "origin/main",
7-
"fixed": [["@copilotkit/*", "@copilotkitnext/*"]],
7+
"fixed": [["@copilotkit/*"]],
88
"ignore": [
99
"*",
1010
"@copilotkit-examples/*",
1111
"!@copilotkit-storybook/*",
12-
"@copilotkitnext/angular-demo",
13-
"@copilotkitnext/angular-demo-server",
14-
"@copilotkitnext/docs",
12+
"@copilotkit/angular-demo",
13+
"@copilotkit/angular-demo-server",
14+
"@copilotkit/docs",
1515
"@apps/node"
1616
],
1717
"linked": [],
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
"@copilotkit/a2ui-renderer": minor
3+
"@copilotkit/core": minor
4+
"@copilotkit/demo-agents": minor
5+
"@copilotkit/eslint-config": minor
6+
"@copilotkit/react-core": minor
7+
"@copilotkit/react-textarea": minor
8+
"@copilotkit/react-ui": minor
9+
"@copilotkit/runtime-client-gql": minor
10+
"@copilotkit/runtime": minor
11+
"@copilotkit/sdk-js": minor
12+
"@copilotkit/shared": minor
13+
"@copilotkit/sqlite-runner": minor
14+
"@copilotkit/typescript-config": minor
15+
"@copilotkit/voice": minor
16+
"@copilotkit/web-inspector": minor
17+
---
18+
19+
refactor: consolidate V1/V2 packages into flat @copilotkit/\* structure

.changeset/cyan-buses-sell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"@copilotkitnext/agent": patch
2+
"@copilotkit/runtime": patch
33
---
44

55
Add vertex AI
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"@copilotkitnext/react": patch
2+
"@copilotkit/react-core": patch
33
---
44

55
fix: respect defaultOpen={false} in CopilotSidebar and CopilotPopup
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@copilotkit/react-ui": patch
3+
---
4+
5+
fix: stabilize Markdown components ref to prevent unnecessary re-renders during streaming

.changeset/fix-race-condition-dropped-runs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"@copilotkitnext/core": patch
2+
"@copilotkit/core": patch
33
"@copilotkit/react-core": patch
44
---
55

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"@copilotkitnext/react": patch
2+
"@copilotkit/react-core": patch
33
---
44

55
fix: address scroll bar styling when using mouse-wheel
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"@copilotkitnext/core": patch
2+
"@copilotkit/core": patch
33
---
44

55
fix: handle empty tool arguments without crashing — treat empty/null/undefined args as `{}` instead of throwing JSON parse error

.changeset/pre.json

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"mode": "exit",
2+
"mode": "pre",
33
"tag": "next",
44
"initialVersions": {
55
"@copilotkit-examples/chat-with-your-data": "0.1.0",
@@ -11,16 +11,16 @@
1111
"@copilotkit-examples/research-canvas": "0.1.0",
1212
"@copilotkit-examples/state-machine": "0.1.0",
1313
"@copilotkit-examples/travel": "0.1.0",
14-
"@copilotkitnext/angular-demo": "0.0.0",
15-
"@copilotkitnext/angular-demo-server": "0.0.0",
14+
"@copilotkit/angular-demo": "0.0.0",
15+
"@copilotkit/angular-demo-server": "0.0.0",
1616
"@copilotkit-storybook/angular": "0.0.5",
17-
"@copilotkitnext/docs": "0.1.8",
17+
"@copilotkit/docs": "0.1.8",
1818
"langgraph-js-starter": "0.1.4",
1919
"agent-langraph-interrupt": "0.0.1",
2020
"web-langraph-interrupt": "0.1.0",
21-
"@copilotkitnext/next-pages-router": "1.54.0",
21+
"@copilotkit/next-pages-router": "1.54.0",
2222
"@apps/node": "0.0.1",
23-
"@copilotkitnext/node-express": "1.54.0",
23+
"@copilotkit/node-express": "1.54.0",
2424
"demo": "0.1.4-next.0",
2525
"@copilotkit-storybook/react": "0.0.0",
2626
"@copilotkit/a2ui-renderer": "1.54.0",
@@ -35,22 +35,21 @@
3535
"@copilotkit/shared": "1.54.0",
3636
"tailwind-config": "1.4.12",
3737
"tsconfig": "1.4.12",
38-
"@copilotkitnext/agent": "1.54.0",
39-
"@copilotkitnext/angular": "1.54.0",
40-
"@copilotkitnext/core": "1.54.0",
41-
"@copilotkitnext/demo-agents": "1.54.0",
42-
"@copilotkitnext/eslint-config": "1.54.0",
43-
"@copilotkitnext/react": "1.54.0",
44-
"@copilotkitnext/runtime": "1.54.0",
45-
"@copilotkitnext/shared": "1.54.0",
46-
"@copilotkitnext/sqlite-runner": "1.54.0",
47-
"@copilotkitnext/typescript-config": "1.54.0",
38+
"@copilotkit/angular": "1.54.0",
39+
"@copilotkit/core": "1.54.0",
40+
"@copilotkit/demo-agents": "1.54.0",
41+
"@copilotkit/eslint-config": "1.54.0",
42+
"@copilotkit/sqlite-runner": "1.54.0",
43+
"@copilotkit/typescript-config": "1.54.0",
4844
"@copilotkit/voice": "1.54.0",
49-
"@copilotkitnext/web-inspector": "1.54.0"
45+
"@copilotkit/web-inspector": "1.54.0",
46+
"@copilotkitnext/angular": "1.54.1-next.6"
5047
},
5148
"changesets": [
49+
"consolidate-v1-v2-packages",
5250
"cyan-buses-sell",
5351
"fix-default-open-prop",
52+
"fix-markdown-streaming-rerenders",
5453
"fix-race-condition-dropped-runs",
5554
"fix-scrollbar-styling",
5655
"funny-dolls-march",

.claude/docs/architecture.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,24 @@ Frontend (React/Angular/Vanilla) → Runtime (Express/Hono server) → Agent
88

99
All layers communicate via the **AG-UI protocol** — an event-based standard streamed over SSE.
1010

11-
## V1 vs V2
11+
## Package Structure
1212

13-
V2 (`@copilotkitnext/`) is the real implementation. V1 (`@copilotkit/`) is the public API that wraps V2 internally. New features always go in V2. If V1 compatibility is needed, create a thin re-export or wrapper in the corresponding V1 package.
13+
All packages live flat under `packages/` using the `@copilotkit/` scope. There is no v1/v2 split — the codebase is consolidated.
1414

15-
## V2 Packages
15+
## Packages
1616

1717
- **shared**: Common utilities, types, and constants used across all other packages.
1818
- **core**: The `CopilotKitCore` orchestrator — the central brain on the frontend. Manages the agent registry, tool registry, context store, and event subscriptions. All framework packages (React, Angular, Vanilla) wrap this.
19-
- **react**: React hooks (`useAgent`, `useFrontendTool`, `useAgentContext`, etc.) and `CopilotKitProvider`. Hooks are thin wrappers that register/unregister with `CopilotKitCore` on mount/unmount.
19+
- **react-core**: The public `<CopilotKit>` provider and hooks. Wraps core for React.
20+
- **react-ui**: Chat UI components — `CopilotChat`, `CopilotPopup`, `CopilotSidebar`, `CopilotPanel`.
21+
- **react-textarea**: The `CopilotTextarea` component for AI-assisted text editing.
2022
- **angular**: Angular DI tokens, services, and signal-based state. Same concepts as React but using Angular patterns (`inject()`, signals, `AgentStore`).
21-
- **runtime**: The server-side `CopilotRuntime` class that receives HTTP requests and delegates to agents. Provides Express and Hono adapters. Contains the `AgentRunner` abstraction for managing thread/conversation state.
23+
- **runtime**: The server-side `CopilotRuntime` class that receives HTTP requests and delegates to agents. Provides Express and Hono adapters. Contains the `AgentRunner` abstraction for managing thread/conversation state. Also includes GraphQL server and LLM adapters.
24+
- **runtime-client-gql**: urql-based GraphQL client for frontend-to-runtime communication.
2225
- **agent**: The `BuiltInAgent` — a default agent implementation powered by the Vercel AI SDK. Used when developers don't bring their own agent framework.
2326
- **voice**: Voice input and transcription support.
2427
- **web-inspector**: A debug console (Lit web component) for inspecting agent communication in development.
2528
- **sqlite-runner**: An `AgentRunner` implementation that persists thread state to SQLite instead of memory.
26-
27-
## V1 Packages
28-
29-
- **react-core**: The public `<CopilotKit>` provider and hooks. Internally delegates to V2 core.
30-
- **react-ui**: Chat UI components — `CopilotChat`, `CopilotPopup`, `CopilotSidebar`, `CopilotPanel`.
31-
- **react-textarea**: The `CopilotTextarea` component for AI-assisted text editing.
32-
- **shared**: Shared types and telemetry utilities.
33-
- **runtime**: Server-side runtime with GraphQL server and LLM adapters.
34-
- **runtime-client-gql**: urql-based GraphQL client for frontend-to-runtime communication.
3529
- **sdk-js**: Helpers for LangGraph/LangChain agent integration.
3630

3731
## Request Lifecycle

0 commit comments

Comments
 (0)