refactor: split SDK RPC client

.changeset/split-sdk-rpc-client.md

@@ -0,0 +1,6 @@
+---
+"@moonshot-ai/kimi-code-sdk": minor
+"@moonshot-ai/kimi-code": patch
+---
+
+Allow SDK runtime creation to use a separate RPC client while preserving local CLI startup.

apps/kimi-code/src/cli/run-prompt.ts

@@ -7,11 +7,12 @@ import {
 } from '@moonshot-ai/kimi-telemetry';
 import chalk from 'chalk';
 import {
-  KimiHarness,
+  createKimiHarness,
   log,
   type Event,
   type GoalSnapshot,
   type HookResultEvent,
+  type KimiHarness,
   type Session,
   type SessionStatus,
   type TelemetryClient,
@@ -68,7 +69,7 @@ export async function runPrompt(
     withContext: withTelemetryContext,
     setContext: setTelemetryContext,
   };
-  const harness = new KimiHarness({
+  const harness = createKimiHarness({
     homeDir: telemetryBootstrap.homeDir,
     identity: createKimiCodeHostIdentity(version),
     uiMode: PROMPT_UI_MODE,

apps/kimi-code/src/cli/run-shell.ts

@@ -9,7 +9,12 @@ import {
   track,
   withTelemetryContext,
 } from '@moonshot-ai/kimi-telemetry';
-import { KimiHarness, log, type TelemetryClient } from '@moonshot-ai/kimi-code-sdk';
+import {
+  createKimiHarness,
+  log,
+  type KimiHarness,
+  type TelemetryClient,
+} from '@moonshot-ai/kimi-code-sdk';
 
 import { CLI_SHUTDOWN_TIMEOUT_MS, CLI_UI_MODE } from '#/constant/app';
 import { detectPendingMigration } from '#/migration/index';
@@ -51,7 +56,7 @@ export async function runShell(
     withContext: withTelemetryContext,
     setContext: setTelemetryContext,
   };
-  const harness = new KimiHarness({
+  const harness = createKimiHarness({
     homeDir: telemetryBootstrap.homeDir,
     identity: createKimiCodeHostIdentity(version),
     telemetry: telemetryClient,

apps/kimi-code/src/cli/sub/export.ts

@@ -14,9 +14,10 @@ import {
   withTelemetryContext,
 } from '@moonshot-ai/kimi-telemetry';
 import {
-  KimiHarness,
+  createKimiHarness,
   type ExportSessionInput,
   type ExportSessionResult,
+  type KimiHarness,
   type SessionSummary,
   type ShellEnvironment,
   type TelemetryClient,
@@ -144,7 +145,7 @@ function createDefaultExportDeps(overrides: Partial<ExportDeps> = {}): ExportDep
   };
   const getHarness = (): KimiHarness => {
     const currentTelemetryBootstrap = getTelemetryBootstrap();
-    harness ??= new KimiHarness({
+    harness ??= createKimiHarness({
       homeDir: currentTelemetryBootstrap.homeDir,
       identity,
       telemetry: telemetryClient,

apps/kimi-code/src/cli/sub/provider.ts

@@ -23,13 +23,14 @@ import {
   catalogBaseUrl,
   catalogProviderModels,
   CatalogFetchError,
+  createKimiHarness,
   DEFAULT_CATALOG_URL,
   fetchCatalog,
   inferWireType,
-  KimiHarness,
   type Catalog,
   type CatalogProviderEntry,
   type KimiConfig,
+  type KimiHarness,
 } from '@moonshot-ai/kimi-code-sdk';
 import type { Command } from 'commander';
 
@@ -487,7 +488,7 @@ function resolveDeps(overrides: Partial<ProviderDeps> = {}): ProviderDeps {
     getHarness:
       overrides.getHarness ??
       (() => {
-        harness ??= new KimiHarness({ identity });
+        harness ??= createKimiHarness({ identity });
         return harness;
       }),
     stdout: overrides.stdout ?? process.stdout,

apps/kimi-code/src/main.ts

@@ -6,7 +6,7 @@
  */
 
 import {
-  KimiHarness,
+  createKimiHarness,
   flushDiagnosticLogs,
   log,
   resolveGlobalLogPath,
@@ -78,7 +78,7 @@ export async function handleUpgradeCommand(version: string): Promise<void> {
     withContext: withTelemetryContext,
     setContext: setTelemetryContext,
   };
-  const harness = new KimiHarness({
+  const harness = createKimiHarness({
     homeDir: telemetryBootstrap.homeDir,
     identity: createKimiCodeHostIdentity(version),
     telemetry: telemetryClient,

apps/kimi-code/test/cli/export.test.ts

@@ -52,24 +52,23 @@ vi.mock('@moonshot-ai/kimi-code-sdk', async (importOriginal) => {
   return {
     ...actual,
     resolveKimiHome: mocks.resolveKimiHome,
-    KimiHarness: class {
-      homeDir: string;
-      auth = {
-        getCachedAccessToken: mocks.harnessGetCachedAccessToken,
-      };
-      ensureConfigFile = mocks.harnessEnsureConfigFile;
-      getConfig = mocks.harnessGetConfig;
-      track = mocks.harnessTrack;
-      constructor(...args: unknown[]) {
-        const options = args[0] as { readonly homeDir?: string } | undefined;
-        this.homeDir = options?.homeDir ?? '/tmp/kimi-export-home';
-        if (mocks.harnessCreatesDeviceIdOnConstruction) {
-          mocks.createKimiDeviceId(this.homeDir);
-        }
-        mocks.kimiHarnessConstructor(...args);
+    createKimiHarness: (...args: unknown[]) => {
+      const options = args[0] as { readonly homeDir?: string } | undefined;
+      const homeDir = options?.homeDir ?? '/tmp/kimi-export-home';
+      if (mocks.harnessCreatesDeviceIdOnConstruction) {
+        mocks.createKimiDeviceId(homeDir);
       }
-
-      exportSession = mocks.harnessExportSession;
+      mocks.kimiHarnessConstructor(...args);
+      return {
+        homeDir,
+        auth: {
+          getCachedAccessToken: mocks.harnessGetCachedAccessToken,
+        },
+        ensureConfigFile: mocks.harnessEnsureConfigFile,
+        getConfig: mocks.harnessGetConfig,
+        track: mocks.harnessTrack,
+        exportSession: mocks.harnessExportSession,
+      };
     },
   };
 });

apps/kimi-code/test/cli/goal-prompt.test.ts

@@ -119,19 +119,18 @@ vi.mock('@moonshot-ai/kimi-code-sdk', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@moonshot-ai/kimi-code-sdk')>();
   return {
     ...actual,
-    KimiHarness: class {
-      homeDir = '/tmp/kimi-goal-home';
-      auth = { getCachedAccessToken: vi.fn() };
-      ensureConfigFile = vi.fn();
-      getConfig = vi.fn(async () => ({ providers: {}, defaultModel: 'k2', telemetry: true }));
-      getExperimentalFlags = vi.fn(async () => mocks.experimentalFlags);
-      createSession = vi.fn(async () => mocks.session);
-      resumeSession = vi.fn(async () => mocks.session);
-      listSessions = vi.fn(async () => mocks.sessions);
-      close = vi.fn();
-      track = vi.fn();
-      constructor() {}
-    },
+    createKimiHarness: () => ({
+      homeDir: '/tmp/kimi-goal-home',
+      auth: { getCachedAccessToken: vi.fn() },
+      ensureConfigFile: vi.fn(),
+      getConfig: vi.fn(async () => ({ providers: {}, defaultModel: 'k2', telemetry: true })),
+      getExperimentalFlags: vi.fn(async () => mocks.experimentalFlags),
+      createSession: vi.fn(async () => mocks.session),
+      resumeSession: vi.fn(async () => mocks.session),
+      listSessions: vi.fn(async () => mocks.sessions),
+      close: vi.fn(),
+      track: vi.fn(),
+    }),
   };
 });
 

apps/kimi-code/test/cli/main.test.ts

@@ -46,6 +46,7 @@ const mocks = vi.hoisted(() => {
       track: vi.fn(),
     },
     KimiHarness: vi.fn(),
+    createKimiHarness: vi.fn(),
   };
 });
 
@@ -74,6 +75,10 @@ vi.mock('@moonshot-ai/kimi-code-sdk', async () => {
   }
   return {
     ...actual,
+    createKimiHarness: (...args: unknown[]) => {
+      mocks.createKimiHarness(...args);
+      return mocks.harness;
+    },
     KimiHarness: MockKimiHarness,
     log: mocks.log,
   };
@@ -272,7 +277,7 @@ describe('main entry command handling', () => {
 
     expect(exitCode).toBe(0);
     expect(mocks.createCliTelemetryBootstrap).toHaveBeenCalledTimes(1);
-    expect(mocks.KimiHarness).toHaveBeenCalledWith(expect.objectContaining({
+    expect(mocks.createKimiHarness).toHaveBeenCalledWith(expect.objectContaining({
       homeDir: '/tmp/kimi-home',
       telemetry: {
         track: mocks.track,

apps/kimi-code/test/cli/run-prompt.test.ts

@@ -79,26 +79,25 @@ vi.mock('@moonshot-ai/kimi-code-sdk', async (importOriginal) => {
   return {
     ...actual,
     resolveKimiHome: mocks.resolveKimiHome,
-    KimiHarness: class {
-      homeDir: string;
-      auth = { getCachedAccessToken: mocks.harnessGetCachedAccessToken };
-      ensureConfigFile = mocks.harnessEnsureConfigFile;
-      getConfig = mocks.harnessGetConfig;
-      getExperimentalFlags = mocks.harnessGetExperimentalFlags;
-      createSession = mocks.harnessCreateSession;
-      resumeSession = mocks.harnessResumeSession;
-      listSessions = mocks.harnessListSessions;
-      close = mocks.harnessClose;
-      track = mocks.harnessTrack;
-
-      constructor(...args: unknown[]) {
-        const options = args[0] as { readonly homeDir?: string } | undefined;
-        this.homeDir = options?.homeDir ?? '/tmp/kimi-code-test-home';
-        if (mocks.harnessCreatesDeviceIdOnConstruction) {
-          mocks.createKimiDeviceId(this.homeDir);
-        }
-        mocks.kimiHarnessConstructor(...args);
+    createKimiHarness: (...args: unknown[]) => {
+      const options = args[0] as { readonly homeDir?: string } | undefined;
+      const homeDir = options?.homeDir ?? '/tmp/kimi-code-test-home';
+      if (mocks.harnessCreatesDeviceIdOnConstruction) {
+        mocks.createKimiDeviceId(homeDir);
       }
+      mocks.kimiHarnessConstructor(...args);
+      return {
+        homeDir,
+        auth: { getCachedAccessToken: mocks.harnessGetCachedAccessToken },
+        ensureConfigFile: mocks.harnessEnsureConfigFile,
+        getConfig: mocks.harnessGetConfig,
+        getExperimentalFlags: mocks.harnessGetExperimentalFlags,
+        createSession: mocks.harnessCreateSession,
+        resumeSession: mocks.harnessResumeSession,
+        listSessions: mocks.harnessListSessions,
+        close: mocks.harnessClose,
+        track: mocks.harnessTrack,
+      };
     },
   };
 });

apps/kimi-code/test/cli/run-shell.test.ts

@@ -68,24 +68,23 @@ vi.mock('@moonshot-ai/kimi-code-sdk', async (importOriginal) => {
   return {
     ...actual,
     resolveKimiHome: mocks.resolveKimiHome,
-    KimiHarness: class {
-      homeDir: string;
-      auth = {
-        getCachedAccessToken: mocks.harnessGetCachedAccessToken,
-      };
-      ensureConfigFile = mocks.harnessEnsureConfigFile;
-      getConfig = mocks.harnessGetConfig;
-      close = mocks.harnessClose;
-      track = mocks.harnessTrack;
-
-      constructor(...args: unknown[]) {
-        const options = args[0] as { readonly homeDir?: string } | undefined;
-        this.homeDir = options?.homeDir ?? '/tmp/kimi-code-test-home';
-        if (mocks.harnessCreatesDeviceIdOnConstruction) {
-          mocks.createKimiDeviceId(this.homeDir);
-        }
-        mocks.kimiHarnessConstructor(...args);
+    createKimiHarness: (...args: unknown[]) => {
+      const options = args[0] as { readonly homeDir?: string } | undefined;
+      const homeDir = options?.homeDir ?? '/tmp/kimi-code-test-home';
+      if (mocks.harnessCreatesDeviceIdOnConstruction) {
+        mocks.createKimiDeviceId(homeDir);
       }
+      mocks.kimiHarnessConstructor(...args);
+      return {
+        homeDir,
+        auth: {
+          getCachedAccessToken: mocks.harnessGetCachedAccessToken,
+        },
+        ensureConfigFile: mocks.harnessEnsureConfigFile,
+        getConfig: mocks.harnessGetConfig,
+        close: mocks.harnessClose,
+        track: mocks.harnessTrack,
+      };
     },
   };
 });

apps/kimi-code/test/e2e/local-logging-export.e2e.test.ts

@@ -8,7 +8,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { registerExportCommand } from '#/cli/sub/export';
 import { createKimiCodeHostIdentity } from '#/cli/version';
-import { KimiHarness, log } from '@moonshot-ai/kimi-code-sdk';
+import { createKimiHarness, log } from '@moonshot-ai/kimi-code-sdk';
 import { __resetRootLoggerForTest } from '../../../../packages/agent-core/src/logging/logger';
 
 const SESSION_LOG = 'logs/kimi-code.log';
@@ -49,7 +49,7 @@ afterEach(async () => {
 
 describe.skipIf(!ENABLED)('local logging export e2e', () => {
   it('exports session log and global log by default, and allows skipping global log', async () => {
-    const harness = new KimiHarness({
+    const harness = createKimiHarness({
       homeDir,
       identity: createKimiCodeHostIdentity('0.1.1'),
     });

apps/kimi-code/test/e2e/real-llm-smoke.e2e.test.ts

@@ -14,7 +14,7 @@
 import { mkdirSync } from 'node:fs';
 import process from 'node:process';
 
-import { KimiHarness, type Event } from '@moonshot-ai/kimi-code-sdk';
+import { createKimiHarness, type Event } from '@moonshot-ai/kimi-code-sdk';
 import { describe, expect, test } from 'vitest';
 
 import { createKimiCodeHostIdentity, getVersion } from '#/cli/version';
@@ -41,7 +41,7 @@ describe.skipIf(!ENABLED)('SDK e2e — real LLM smoke', () => {
           `[smoke] prompt=${JSON.stringify(prompt)}\n`,
       );
 
-      const harness = new KimiHarness({
+      const harness = createKimiHarness({
         identity: createKimiCodeHostIdentity(version),
       });
 

packages/node-sdk/examples/kimi-harness-auth-smoke.ts

@@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
-import { KimiHarness } from '@moonshot-ai/kimi-code-sdk';
+import { createKimiHarness, type KimiHarness } from '@moonshot-ai/kimi-code-sdk';
 
 import { smokeIdentityFromEnv, runPromptToEnd } from './runtime-smoke-helpers';
 
@@ -17,7 +17,7 @@ async function main(): Promise<void> {
   const forceLogin = process.env['KIMI_SDK_AUTH_SMOKE_FORCE_LOGIN'] === '1';
   const prompt =
     process.env['KIMI_SDK_AUTH_SMOKE_PROMPT'] ?? 'Reply with exactly: Kimi SDK auth smoke ok';
-  const harness = new KimiHarness({ homeDir, identity: smokeIdentityFromEnv() });
+  const harness = createKimiHarness({ homeDir, identity: smokeIdentityFromEnv() });
 
   process.stdout.write(`home: ${homeDir}\n`);
   process.stdout.write(`workDir: ${workDir}\n`);

packages/node-sdk/examples/kimi-harness-cancel-smoke.ts

@@ -1,4 +1,4 @@
-import { KimiHarness } from '@moonshot-ai/kimi-code-sdk';
+import { createKimiHarness } from '@moonshot-ai/kimi-code-sdk';
 
 import {
   smokeIdentityFromEnv,
@@ -10,7 +10,7 @@ const PROMPT =
   'Write a detailed multi-paragraph explanation of how cancellation should work in an SDK streaming session.';
 
 async function main(): Promise<void> {
-  const harness = new KimiHarness({ identity: smokeIdentityFromEnv() });
+  const harness = createKimiHarness({ identity: smokeIdentityFromEnv() });
 
   try {
     const session = await createConfiguredSession(harness);

packages/node-sdk/examples/kimi-harness-config-smoke.ts

@@ -2,13 +2,13 @@ import { mkdtemp, readFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
-import { KimiHarness } from '@moonshot-ai/kimi-code-sdk';
+import { createKimiHarness } from '@moonshot-ai/kimi-code-sdk';
 
 import { smokeIdentityFromEnv } from './runtime-smoke-helpers';
 
 async function main(): Promise<void> {
   const homeDir = await mkdtemp(join(tmpdir(), 'kimi-harness-config-home-'));
-  const harness = new KimiHarness({ homeDir, identity: smokeIdentityFromEnv() });
+  const harness = createKimiHarness({ homeDir, identity: smokeIdentityFromEnv() });
 
   const initial = await harness.getConfig();
   if (Object.keys(initial.providers).length > 0) {