Commit dc624ff
committed
Merge remote-tracking branch 'origin/main' into integrate/split-large-components-main
# Conflicts:
# .env.example
# .eslintrc.cjs
# .github/workflows/ci.yml
# .github/workflows/dev-release.yml
# .github/workflows/release.yml
# AGENTS.md
# README.md
# README.zh-CN.md
# apps/cli/src/commands/builtin/pr_comments.ts
# apps/cli/src/entrypoints/cli/agentsValidate.ts
# apps/cli/src/entrypoints/cli/print/controlRequests.ts
# apps/cli/src/services/outputStyles.ts
# apps/cli/src/services/pluginRuntime.ts
# apps/cli/src/ui/components/ConsoleOAuthFlow.tsx
# apps/cli/src/ui/components/Message.tsx
# apps/cli/src/ui/components/StructuredDiff.tsx
# apps/cli/src/ui/components/binary-feedback/BinaryFeedbackView.tsx
# apps/cli/src/ui/components/messages/AssistantToolUseMessage.tsx
# apps/cli/src/ui/components/messages/UserToolResultMessage/FallbackToolResultMessage.tsx
# apps/cli/src/ui/components/messages/UserToolResultMessage/UserToolRejectMessage.tsx
# apps/cli/src/ui/components/permissions/FilesystemPermissionRequest/FilesystemPermissionRequest.tsx
# apps/cli/src/ui/hooks/useDoublePress.ts
# apps/cli/src/utils/completion/advancedFuzzyMatcher.ts
# apps/cli/src/utils/completion/fuzzyMatcher.ts
# apps/server/src/acp/errors.ts
# apps/server/src/acp/index.ts
# apps/server/src/acp/jsonrpc.ts
# apps/server/src/acp/protocol/base.ts
# apps/server/src/acp/sessionManager.ts
# apps/server/src/acp/sessionStore.ts
# apps/server/src/acp/stdioTransport.ts
# apps/server/src/acp/validation.ts
# bun.lock
# package.json
# packages/core/src/ai/adapters/base.ts
# packages/core/src/ai/adapters/chatCompletions.ts
# packages/core/src/ai/adapters/responsesStreaming.ts
# packages/core/src/ai/modelAdapterFactory.ts
# packages/core/src/context/index.ts
# packages/core/src/feedback/binaryFeedback.ts
# packages/core/src/mcp/client/utils.ts
# packages/core/src/permissions/filesystem.ts
# packages/core/src/services/connection.ts
# packages/core/src/services/manager.ts
# packages/core/src/services/oauth.ts
# packages/core/src/test/diagnostic/diagnostic-stream-test.test.ts
# packages/core/src/test/integration/acp-smoke.test.ts
# packages/core/src/test/integration/sandbox-network-macos-proxy.test.ts
# packages/core/src/test/production/bash-intent-gate-real.test.ts
# packages/core/src/test/production/responses-api-tool-processing.test.ts
# packages/core/src/test/tools/file-read-tool-parity.test.ts
# packages/core/src/test/unit/acp-jsonrpc-validation.test.ts
# packages/core/src/test/unit/acp-session-store-manager.test.ts
# packages/core/src/test/unit/anthropic-helpers.test.ts
# packages/core/src/test/unit/base-adapter-streaming.test.ts
# packages/core/src/test/unit/bash-cd-trailing-space.test.ts
# packages/core/src/test/unit/bash-llm-gate.test.ts
# packages/core/src/test/unit/bash-tool-ctrl-b-background.test.ts
# packages/core/src/test/unit/bash-tool-progress.test.ts
# packages/core/src/test/unit/bash-tool-sandbox-indicator.test.ts
# packages/core/src/test/unit/bun-shell-sandbox-bwrap.test.ts
# packages/core/src/test/unit/chat-completions-e2e.test.ts
# packages/core/src/test/unit/cli-command-registration.test.ts
# packages/core/src/test/unit/config-loader-cache.test.ts
# packages/core/src/test/unit/config-validator-openrouter.test.ts
# packages/core/src/test/unit/destructive-command-guard-crossplatform.test.ts
# packages/core/src/test/unit/git-email.test.ts
# packages/core/src/test/unit/hooks-stop.test.ts
# packages/core/src/test/unit/image-media.test.ts
# packages/core/src/test/unit/mcp-connection-internals.test.ts
# packages/core/src/test/unit/mcp-content-normalization.test.ts
# packages/core/src/test/unit/mcp-manager-lifecycle.test.ts
# packages/core/src/test/unit/mcp-tool-result-rendering.test.tsx
# packages/core/src/test/unit/permission-mode-dontask.test.ts
# packages/core/src/test/unit/plugin-tokenizer-windows.test.ts
# packages/core/src/test/unit/process-user-input-images.test.ts
# packages/core/src/test/unit/project-instructions-path.test.ts
# packages/core/src/test/unit/responses-api-e2e.test.ts
# packages/core/src/test/unit/session-load.test.ts
# packages/core/src/test/unit/shell-cmd-selection.test.ts
# packages/core/src/test/unit/suspicious-windows-path.test.ts
# packages/core/src/test/unit/terminal-setup-module.test.ts
# packages/core/src/test/unit/user-tool-result-message-orphaned.test.tsx
# packages/core/src/todo/storage.ts
# packages/core/src/types/conversation.ts
# packages/core/src/types/logs.ts
# packages/core/src/types/notebook.ts
# packages/core/src/types/toolPermissionContext.ts
# packages/core/src/types/untyped-deps.d.ts
# packages/core/src/utils/agentStorage.ts
# packages/core/src/utils/autoUpdater.ts
# packages/core/src/utils/expertChatStorage.ts
# packages/core/src/utils/file.ts
# packages/core/src/utils/hashCommand.ts
# packages/core/src/utils/imagePaste.ts
# packages/core/src/utils/style.ts
# packages/core/src/utils/unaryLogging.ts
# packages/core/src/utils/visionContent.ts
# packages/protocol/src/commandSource.ts
# packages/protocol/src/streamJson.ts
# packages/protocol/src/utils/kodeAgentSessionLog.ts
# packages/runtime/src/file.ts
# packages/tools/src/tools/filesystem/FileEditTool/FileEditTool.tsx
# packages/tools/src/tools/filesystem/FileEditTool/utils.ts
# packages/tools/src/tools/filesystem/GlobTool/GlobTool.tsx
# packages/tools/src/tools/interaction/TodoWriteTool/TodoWriteTool.tsx
# packages/tools/src/tools/mcp/ListMcpResourcesTool/ListMcpResourcesTool.tsx
# scripts/prepublish-check.js
# src/acp/kodeAcpAgent.ts
# src/acp/stdoutGuard.ts
# src/app/query.ts
# src/commands/agents/generation.ts
# src/commands/agents/ui.tsx
# src/commands/compact.ts
# src/commands/terminalSetup.ts
# src/constants/models.ts
# src/constants/prompts.ts
# src/core/config/defaults.ts
# src/core/config/index.ts
# src/core/config/loader.ts
# src/core/config/migrations.ts
# src/core/permissions/engine/index.ts
# src/core/permissions/index.ts
# src/core/permissions/rules/index.ts
# src/core/permissions/rules/planMode.ts
# src/core/permissions/store/index.ts
# src/core/permissions/store/savePermission.ts
# src/core/permissions/ui-helpers/index.ts
# src/core/permissions/ui-helpers/types.ts
# src/core/tools/defineTool.ts
# src/core/tools/executor.ts
# src/core/tools/index.ts
# src/core/tools/registry.ts
# src/entrypoints/acp.ts
# src/entrypoints/cli.tsx
# src/entrypoints/cli/printMode.ts
# src/entrypoints/cli/runCli.tsx
# src/entrypoints/cli/setup.ts
# src/entrypoints/cli/stdio/canUseTool.ts
# src/entrypoints/cli/stdio/streamJsonSession.ts
# src/entrypoints/cli/stdio/structuredStdio.ts
# src/entrypoints/mcp.ts
# src/services/ai/adapters/responsesAPI.ts
# src/services/ai/gpt5ConnectionTest.ts
# src/services/ai/llm.ts
# src/services/ai/openai.ts
# src/services/mcp/client.ts
# src/services/mcp/discovery.ts
# src/services/mcp/index.ts
# src/services/mcp/tools-integration.ts
# src/services/plugins/customCommands.ts
# src/services/plugins/skillMarketplace.ts
# src/services/system/systemReminder.ts
# src/tools/agent/TaskTool/TaskTool.tsx
# src/tools/ai/AskExpertModelTool/AskExpertModelTool.tsx
# src/tools/filesystem/FileReadTool/FileReadTool.tsx
# src/tools/filesystem/FileWriteTool/FileWriteTool.tsx
# src/tools/filesystem/MultiEditTool/MultiEditTool.tsx
# src/tools/network/WebFetchTool/WebFetchTool.tsx
# src/tools/search/LspTool/LspTool.tsx
# src/tools/system/BashTool/BashTool.tsx
# src/tools/system/BashTool/bashGateRules.ts
# src/tools/system/BashTool/llmSafetyGate.ts
# src/types/canUseTool.ts
# src/types/permissionMode.ts
# src/ui/components/Bug.tsx
# src/ui/components/FileEditToolUpdatedMessage.tsx
# src/ui/components/Logo.tsx
# src/ui/components/ModelListManager.tsx
# src/ui/components/ModelSelector.tsx
# src/ui/components/PromptInput.tsx
# src/ui/components/TextInput.tsx
# src/ui/components/custom-select/theme.ts
# src/ui/components/messages/user-tool-result-message/UserToolSuccessMessage.tsx
# src/ui/components/messages/user-tool-result-message/utils.tsx
# src/ui/components/model-selector/ModelSelectionScreen.tsx
# src/ui/components/model-selector/ModelSelector.tsx
# src/ui/components/model-selector/filterModels.ts
# src/ui/components/model-selector/modelFetchers.ts
# src/ui/components/model-selector/printModelConfig.ts
# src/ui/components/permissions/skill-permission-request/SkillPermissionRequest.tsx
# src/ui/hooks/useApiKeyVerification.ts
# src/ui/hooks/useTextInput.ts
# src/ui/hooks/useUnifiedCompletion.ts
# src/ui/screens/Doctor.tsx
# src/ui/screens/MCPServerApproval.tsx
# src/ui/screens/REPL.tsx
# src/ui/screens/ResumeConversation.tsx
# src/utils/agent/loader.ts
# src/utils/bun/shell.ts
# src/utils/completion/commonUnixCommands.ts
# src/utils/fs/secureFile.ts
# src/utils/log/debugLogger.ts
# src/utils/log/index.ts
# src/utils/log/taskOutputStore.ts
# src/utils/messages/core.ts
# src/utils/messages/index.ts
# src/utils/messages/userInput.tsx
# src/utils/model/index.ts
# src/utils/permissions/bashToolPermissionEngine.ts
# src/utils/permissions/fileToolPermissionEngine.ts
# src/utils/protocol/kodeAgentSessionResume.ts
# src/utils/sandbox/sandboxNetworkInfrastructure.ts
# src/utils/session/autoCompactCore.ts
# src/utils/session/kodeHooks.ts
# src/utils/session/messageContextManager.ts
# src/utils/system/http.ts
# src/utils/system/ripgrep.ts
# tests/e2e/cli-smoke.test.ts
# tests/e2e/tui-interactions.test.tsx
# tests/fixtures/mcp/stdio-echo-server.ts
# tests/helpers/loadDotEnv.ts
# tests/integration/integration-cli-flow.test.ts
# tests/integration/mcp/stdio-client-server.test.ts
# tests/integration/node-runtime-smoke.test.ts
# tests/integration/stdio/stream-json-interrupt.test.ts
# tests/unit/binary-utils.test.ts
# tests/unit/config-path-normalization.test.ts
# tests/unit/enter-plan-mode-tool.test.ts
# tests/unit/file-permission-engine.test.ts
# tests/unit/lsp-tool.test.ts
# tests/unit/model-selector.test.tsx
# tests/unit/naming-conventions.test.ts
# tests/unit/no-bun-runtime-api.test.ts
# tests/unit/ripgrep-bundled.test.ts
# tests/unit/smoke.test.ts
# tests/unit/todos-command.test.tsx
# tests/unit/tools/tools-basic.test.ts138 files changed
Lines changed: 5751 additions & 1401 deletions
File tree
- .github/workflows
- apps
- cli/src
- commands
- builtin
- debug
- plugin
- services
- ui
- components
- PromptInput
- messages
- UserToolResultMessage
- hooks
- server/src
- acp
- agent
- handlers
- docs/develop
- packages
- config/src
- models
- core/src
- ai
- adapters
- responsesAPI
- llm
- anthropic
- openai
- constants
- context
- engine
- messages
- pipeline
- feedback
- mcp/client
- permissions/bash
- sandbox
- test
- integration
- tools
- unit
- types
- utils
- image
- runtime/src
- shell
- tools/src/tools
- ai/ArchitectTool
- filesystem
- FileEditTool
- FileReadTool
- FileWriteTool
- mcp
- ListMcpResourcesTool
- MCPTool
- system/BashTool
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
21 | 24 | | |
22 | 25 | | |
23 | 26 | | |
24 | 27 | | |
25 | 28 | | |
26 | | - | |
| 29 | + | |
27 | 30 | | |
28 | 31 | | |
29 | 32 | | |
| |||
32 | 35 | | |
33 | 36 | | |
34 | 37 | | |
| 38 | + | |
35 | 39 | | |
36 | 40 | | |
37 | 41 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
| 57 | + | |
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| |||
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
186 | | - | |
187 | | - | |
188 | | - | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | 132 | | |
217 | | - | |
| 133 | + | |
218 | 134 | | |
219 | 135 | | |
220 | 136 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
| 65 | + | |
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| |||
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
143 | | - | |
| 143 | + | |
144 | 144 | | |
145 | 145 | | |
146 | 146 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
33 | 39 | | |
34 | 40 | | |
35 | 41 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
| 8 | + | |
8 | 9 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
161 | 161 | | |
162 | 162 | | |
163 | 163 | | |
164 | | - | |
| 164 | + | |
165 | 165 | | |
166 | | - | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
186 | | - | |
187 | | - | |
188 | | - | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | 75 | | |
86 | 76 | | |
87 | | - | |
| 77 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | 32 | | |
37 | 33 | | |
38 | 34 | | |
| |||
0 commit comments