Merge pull request #2 from MoonshotAI/main #6
ci.yml
on: push
build
49s
test
6m 37s
test-pi-tui
35s
test-windows
0s
lint
41s
typecheck
26s
Annotations
17 errors and 15 warnings
|
typecheck
Process completed with exit code 2.
|
|
typecheck:
packages/agent-core/src/mcp/connection-manager.ts#L417
Merge conflict marker encountered.
|
|
typecheck:
packages/agent-core/src/mcp/connection-manager.ts#L408
Merge conflict marker encountered.
|
|
typecheck:
packages/agent-core/src/mcp/connection-manager.ts#L399
Merge conflict marker encountered.
|
|
lint
Process completed with exit code 1.
|
|
oxlint:
packages/agent-core/src/mcp/connection-manager.ts#L399
Encountered diff marker
|
|
build
Process completed with exit code 1.
|
|
[cli] test/cli/v2-run-print.test.ts:
apps/kimi-code/src/constant/app.ts#L1
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ src/constant/app.ts:1:1
Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
[cli] test/cli/telemetry.test.ts > initializeServerTelemetry > degrades to enabled with no model when config is unreadable:
apps/kimi-code/src/cli/telemetry.ts#L2
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ src/cli/telemetry.ts:2:1
Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
[cli] test/cli/telemetry.test.ts > initializeServerTelemetry > disables telemetry when config.toml sets telemetry = false:
apps/kimi-code/src/cli/telemetry.ts#L2
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ src/cli/telemetry.ts:2:1
Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
[cli] test/cli/telemetry.test.ts > initializeServerTelemetry > configures the sink with ui_mode="web" and the CLI product identity:
apps/kimi-code/src/cli/telemetry.ts#L2
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ src/cli/telemetry.ts:2:1
Caused by: Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
[cli] test/cli/run-shell.test.ts:
apps/kimi-code/src/cli/run-shell.ts#L5
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ src/cli/run-shell.ts:5:1
Caused by: Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
[cli] test/cli/run-prompt.test.ts:
apps/kimi-code/src/cli/run-prompt.ts#L9
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ src/cli/run-prompt.ts:9:1
Caused by: Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
[cli] test/cli/main.test.ts:
apps/kimi-code/test/cli/main.test.ts#L2
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ test/cli/main.test.ts:2:1
Caused by: Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
[cli] test/cli/login.test.ts:
apps/kimi-code/test/cli/login.test.ts#L30
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ test/cli/login.test.ts:30:1
Caused by: Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
[cli] test/cli/goal-prompt.test.ts:
apps/kimi-code/src/constant/app.ts#L1
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ src/constant/app.ts:1:1
Caused by: Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
[cli] test/cli/export.test.ts:
apps/kimi-code/src/cli/sub/export.ts#L16
Error: [vitest] There was an error when mocking a module. If you are using "vi.mock" factory, make sure there are no top level variables inside, since this call is hoisted to top of the file. Read more: https://vitest.dev/api/vi.html#vi-mock
❯ src/cli/sub/export.ts:16:1
Caused by: Caused by: Error: Transform failed with 1 error:
[PARSE_ERROR] Error: Encountered diff marker
╭─[ packages/agent-core/src/mcp/connection-manager.ts:399:1 ]
│
399 │ <<<<<<< HEAD
│ ───┬───
│ ╰───── between this marker and `=======` is the code that we're merging into
│
408 │ =======
│ ───┬───
│ ╰───── between this marker and `>>>>>>>` is the incoming code
│
417 │ >>>>>>> origin/main
│ ───┬───
│ ╰───── this marker concludes the conflict region
│
│ Help: Conflict markers indicate that a merge was started but could not be completed due to merge conflicts.
│ To resolve a conflict, keep only the code you want and then delete the lines containing conflict markers.
│ If you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code.
│ If you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased.
│ If you have nested conflicts, resolve the outermost conflict first.
─────╯
Plugin: vite:oxc
File: /home/runner/work/kimi-code/kimi-code/packages/agent-core/src/mcp/connection-manager.ts
❯ transformWithOxc ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3745:19
❯ TransformPluginContext.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:3813:26
❯ EnvironmentPluginContainer.transform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:30143:51
❯ loadAndTransform ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:24468:26
❯ fetchModule ../../node_modules/.pnpm/vite@8.0.8_@types+node@22.19.17_esbuild@0.27.7_jiti@2.6.1_tsx@4.21.0_yaml@2.8.3/node_modules/vite/dist/node/chunks/node.js:23059:15
|
|
typecheck
Node.js 20 is deprecated. The following actions target Node.js 20 but are being forced to run on Node.js 24: actions/checkout@v4. For more information see: https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
|
|
test-pi-tui
Node.js 20 is deprecated. The following actions target Node.js 20 but are being forced to run on Node.js 24: actions/checkout@v4. For more information see: https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
|
|
lint
Node.js 20 is deprecated. The following actions target Node.js 20 but are being forced to run on Node.js 24: actions/checkout@v4. For more information see: https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
|
|
eslint-plugin-import(no-named-as-default-member):
packages/agent-core-v2/src/app/skillCatalog/parser.ts#L98
"path" also has a named export "basename"
|
|
eslint-plugin-import(no-named-as-default-member):
packages/agent-core-v2/src/app/skillCatalog/fileSkillDiscovery.ts#L132
"path" also has a named export "join"
|
|
eslint-plugin-import(no-named-as-default-member):
packages/agent-core-v2/src/app/skillCatalog/fileSkillDiscovery.ts#L115
"path" also has a named export "join"
|
|
eslint-plugin-import(no-named-as-default-member):
packages/agent-core-v2/src/app/skillCatalog/fileSkillDiscovery.ts#L104
"path" also has a named export "basename"
|
|
eslint-plugin-import(no-named-as-default-member):
packages/agent-core-v2/src/app/skillCatalog/fileSkillDiscovery.ts#L97
"path" also has a named export "join"
|
|
eslint-plugin-import(no-named-as-default-member):
packages/agent-core-v2/src/app/skillCatalog/fileSkillDiscovery.ts#L80
"path" also has a named export "join"
|
|
eslint-plugin-import(no-named-as-default-member):
packages/agent-core-v2/src/app/skillCatalog/fileSkillDiscovery.ts#L67
"path" also has a named export "join"
|
|
eslint-plugin-import(no-named-as-default-member):
packages/agent-core-v2/src/app/skillCatalog/fileSkillDiscovery.ts#L64
"path" also has a named export "join"
|
|
eslint-plugin-unicorn(prefer-string-replace-all):
packages/agent-core-v2/src/agent/toolResultTruncation/toolResultTruncationService.ts#L108
Prefer `String#replaceAll()` over `String#replace()` when using a regex with the global flag.
|
|
eslint-plugin-unicorn(prefer-string-replace-all):
packages/agent-core-v2/src/agent/toolResultTruncation/toolResultTruncationService.ts#L109
Prefer `String#replaceAll()` over `String#replace()` when using a regex with the global flag.
|
|
build
Node.js 20 is deprecated. The following actions target Node.js 20 but are being forced to run on Node.js 24: actions/checkout@v4. For more information see: https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
|
|
test
Node.js 20 is deprecated. The following actions target Node.js 20 but are being forced to run on Node.js 24: actions/checkout@v4. For more information see: https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
|