Architecture cleanup — SDK/client 层重组 + 路径统一 + 死代码清除

packages/codingcode/package.json

@@ -33,10 +33,13 @@
     "./server/adapter": "./src/server/adapter.ts",
     "./server/port-discovery": "./src/server/port-discovery.ts",
     "./client/types": "./src/client/types.ts",
-    "./client/direct": "./src/client/direct.ts",
     "./client/http": "./src/client/http.ts",
     "./client/http-clients": "./src/client/http/index.ts",
-    "./client/direct-clients": "./src/client/direct/index.ts",
+    "./direct/agent-runtime": "./src/direct/agent-runtime.ts",
+    "./direct/sessions": "./src/direct/sessions.ts",
+    "./direct/settings": "./src/direct/settings.ts",
+    "./direct/models": "./src/direct/models.ts",
+    "./agent/stream-adapter": "./src/agent/stream-adapter.ts",
     "./checkpoint/checkpoint-service": "./src/checkpoint/checkpoint-service.ts",
     "./checkpoint/shadow-git": "./src/checkpoint/shadow-git.ts",
     "./checkpoint/bootstrap": "./src/checkpoint/bootstrap.ts",

packages/codingcode/src/agent/agent.ts

@@ -21,7 +21,7 @@
 import { MemoryService } from '../memory/index.js';
 import { createLogger } from '@codingcode/infra/logger';
 import { resolveSubagentEnabled, resolveAgentDisabled } from '../subagent/registry.js';
 import { ProjectRuntimeService, modeToProfile } from '../runtime/project-runtime.js';
 import { createDispatchAgentTool } from '../tools/domains/subagent/dispatch.js';
 import { LLMFactoryService } from '../llm/factory.js';
 import { getBuiltinTools } from '../tools/providers.js';
@@ -122,10 +122,10 @@
   llm: LLMClient,
   options: {
     signal?: AbortSignal;
-    approvalOverride?: any;
-    mode: SessionMode;
-    permissionMode: PermissionMode;
-    model: string;
+    approvalOverride?: import('../approval/index.js').ApprovalService;
+    mode?: SessionMode;
+    permissionMode?: PermissionMode;
+    model?: string;
   }
 ) =>
   Effect.gen(function* () {
@@ -134,12 +134,12 @@
     const hooks = yield* HookService;
     const mcp = yield* McpService;
     const checkpoint = yield* CheckpointService;
     const approval = yield* ApprovalService;
     const skills = yield* SkillService;
     const runtime = yield* ProjectRuntimeService;
     const todo = yield* TodoService;
     const rules = yield* RulesService;
     const context = yield* ContextService;
     const memory = yield* MemoryService;
     const factory = yield* LLMFactoryService;
 
@@ -148,18 +148,19 @@
     yield* skills.evictProject(normalizedCwd);
 
     if (!sessionId) {
-      const created = yield* session.create(normalizedCwd, {
+      if (!options.mode || !options.permissionMode || !options.model) {
+        return yield* Effect.fail(
+          new AgentError(
+            'CONFIG_MISSING',
+            'new session requires mode, permissionMode, and model'
+          )
+        );
+      }
+      const created = yield* session.createSessionWithProfile(normalizedCwd, {
         model: options.model,
         mode: options.mode,
         permissionMode: options.permissionMode,
       });
-      const profile = modeToProfile(options.mode);
-      yield* runtime.setSessionProfile(
-        normalizedCwd,
-        created.sessionId,
-        profile,
-        options.permissionMode
-      );
       sessionId = created.sessionId;
     }
     const state = yield* session.load(normalizedCwd, sessionId);
@@ -335,12 +336,7 @@
 
         const compressResult = yield* Effect.tryPromise({
           try: () =>
-            context.compactIfNeeded(
-              state.transcriptPath,
-              messages,
-              llm.modelInfo.maxTokens,
-              llm
-            ),
+            context.compactIfNeeded(state.transcriptPath, messages, llm.modelInfo.maxTokens, llm),
           catch: (e) => new AgentError('LLM_FAILED', String(e)),
         });
         if (compressResult.didCompress && compressResult.messages) {
@@ -499,7 +495,7 @@
           }
         }
 
         const record = yield* session.recordAssistant(state, resp.content, toolCalls!, resp.usage);
         const allResults = yield* executor.executeBatch(toolCalls, state.sessionId, {
           turnId: state.currentTurnId,
           projectPath,

packages/codingcode/src/agent/stream-adapter.ts

@@ -0,0 +1,67 @@
+import type { AgentEvent } from './types.js';
+import type { StreamChunk } from '../client/types.js';
+
+export async function* agentEventToStreamChunk(
+  source: AsyncGenerator<AgentEvent, any, unknown>
+): AsyncGenerator<StreamChunk, void, unknown> {
+  let currentStep = 0;
+  for await (const event of source) {
+    switch (event._tag) {
+      case 'Step':
+        currentStep = event.step;
+        break;
+      case 'TurnId':
+        yield { type: 'turn_id', turnId: event.turnId };
+        break;
+      case 'LlmChunk':
+        yield { type: 'text', text: event.text, messageId: currentStep };
+        break;
+      case 'Assistant':
+        yield { type: 'message', id: currentStep, content: event.content, partial: false };
+        break;
+      case 'ToolStart':
+        yield { type: 'tool_start', id: event.id, name: event.name, args: event.args };
+        break;
+      case 'ToolResult':
+        yield {
+          type: 'tool_result',
+          id: event.id,
+          name: event.name,
+          output: event.output,
+          ok: event.ok,
+        };
+        break;
+      case 'ToolDenied':
+        yield { type: 'tool_denied', id: event.id, name: event.name, reason: event.reason };
+        break;
+      case 'Error':
+        yield {
+          type: 'error',
+          message: event.error.message ?? String(event.error),
+          code: event.error.code,
+        };
+        break;
+      case 'Done':
+        yield { type: 'done' };
+        break;
+      case 'TodoUpdate':
+        yield { type: 'todo_update', items: event.items as any };
+        break;
+      case 'Usage':
+        yield {
+          type: 'usage',
+          prompt: event.prompt,
+          completion: event.completion,
+          total: event.total,
+        };
+        break;
+      case 'ReactiveCompact':
+        yield {
+          type: 'reactive_compact',
+          released: event.released,
+          promptEstimate: event.promptEstimate,
+        };
+        break;
+    }
+  }
+}

packages/codingcode/src/agent/types.ts

@@ -98,6 +98,6 @@ export interface RunStreamOptions {
   agentName?: string;
   maxStepsOverride?: number;
   maxStopContinuations?: number;
-  approvalOverride?: any;
+  approvalOverride?: import('../approval/index.js').ApprovalService;
   rulesText?: string;
 }

packages/codingcode/src/approval/index.ts

@@ -13,7 +13,6 @@ export class ApprovalService extends Effect.Service<ApprovalService>()('Approval
     const ruleEngine: RuleEngine = createRuleEngine(DEFAULT_DENY_RULES);
     const destructiveTools = new Set(DANGEROUS_TOOL_NAMES);
     const readonlyTools = new Set(READONLY_TOOL_NAMES);
-    let _globalPermissionMode: PermissionMode = 'default';
 
     function makeForkedService(
       engine: RuleEngine,
@@ -64,6 +63,7 @@ export class ApprovalService extends Effect.Service<ApprovalService>()('Approval
         fork: (opts?: {
           extraDenyRules?: PermissionRule[];
           readonly?: boolean;
+          permissionMode?: PermissionMode;
         }): Effect.Effect<ApprovalService> =>
           Effect.sync(() => {
             const nextEngine = createRuleEngine(engine.getAllRules());
@@ -84,7 +84,7 @@ export class ApprovalService extends Effect.Service<ApprovalService>()('Approval
             }
             return makeForkedService(
               nextEngine,
-              currentPermMode,
+              opts?.permissionMode ?? currentPermMode,
               new Set(roTools),
               new Set(destTools)
             );
@@ -112,7 +112,7 @@ export class ApprovalService extends Effect.Service<ApprovalService>()('Approval
             ruleEngine,
             readonlyTools,
             destructiveTools,
-            permissionMode: _globalPermissionMode,
+            permissionMode: 'default',
             onAlways: (rule) => ruleEngine.addRule(rule),
             onNever: (rule) => ruleEngine.addRule(rule),
             sessionId: request.sessionId,
@@ -129,16 +129,17 @@ export class ApprovalService extends Effect.Service<ApprovalService>()('Approval
 
       removeRule: (id: string): Effect.Effect<void> => Effect.sync(() => ruleEngine.removeRule(id)),
 
-      setPermissionMode: (mode: PermissionMode): Effect.Effect<void> =>
+      setPermissionMode: (_mode: PermissionMode): Effect.Effect<void> =>
         Effect.sync(() => {
-          _globalPermissionMode = mode;
+          /* no-op at root; only fork children maintain their own currentPermMode */
         }),
 
-      getPermissionMode: (): PermissionMode => _globalPermissionMode,
+      getPermissionMode: (): PermissionMode => 'default',
 
       fork: (opts?: {
         extraDenyRules?: PermissionRule[];
         readonly?: boolean;
+        permissionMode?: PermissionMode;
       }): Effect.Effect<ApprovalService> =>
         Effect.sync(() => {
           const parentRules = ruleEngine.getAllRules();
@@ -161,7 +162,7 @@ export class ApprovalService extends Effect.Service<ApprovalService>()('Approval
           }
           return makeForkedService(
             childEngine,
-            _globalPermissionMode,
+            opts?.permissionMode ?? 'default',
             new Set(readonlyTools),
             new Set(destructiveTools)
           );

packages/codingcode/src/approval/types.ts

@@ -1,6 +1,10 @@
 export type PermissionMode = 'default' | 'acceptEdits' | 'bypass';
 
-export const PERMISSION_MODES: readonly PermissionMode[] = ['default', 'acceptEdits', 'bypass'] as const;
+export const PERMISSION_MODES: readonly PermissionMode[] = [
+  'default',
+  'acceptEdits',
+  'bypass',
+] as const;
 
 export function isPermissionMode(value: unknown): value is PermissionMode {
   return typeof value === 'string' && (PERMISSION_MODES as readonly string[]).includes(value);

packages/codingcode/src/cli.ts

@@ -38,9 +38,12 @@ async function main() {
 
     if (tuiOnly) {
       const tuiPath = '../../tui/src/index.js';
-      const { runTui } = yield* Effect.tryPromise(() => import(tuiPath));
+      const { runTui, createTuiClientFromFacades } = yield* Effect.tryPromise(() =>
+        import(tuiPath)
+      );
       const llm = yield* llmFactory.getLLMClient();
-      runTui({ llm, rt });
+      const client = createTuiClientFromFacades(llm, rt);
+      runTui({ client });
       return;
     }
 
@@ -50,9 +53,12 @@ async function main() {
 
     if (!serveOnly) {
       const tuiPath = '../../tui/src/index.js';
-      const { runTui } = yield* Effect.tryPromise(() => import(tuiPath));
+      const { runTui, createTuiClientFromFacades } = yield* Effect.tryPromise(() =>
+        import(tuiPath)
+      );
       const llm = yield* llmFactory.getLLMClient();
-      runTui({ llm, rt });
+      const client = createTuiClientFromFacades(llm, rt);
+      runTui({ client });
     }
   });