@downcity/agent 1.1.430 → 1.1.438

package/src/index.ts

@@ -50,15 +50,7 @@ export type {
 } from "./group/index.js";
 export { AiDispatchStrategy } from "./group/index.js";
 export type { SessionStore } from "./types/store/SessionStore.js";
-export type {
-  CompactActiveMessagesInput,
-  CompactActiveMessagesResult,
-  SessionMessageCommitState,
-  SessionMessageStore,
-  SessionDataStore,
-} from "./types/store/SessionDataStore.js";
 export type { SessionAttachmentStore } from "./types/store/SessionAttachmentStore.js";
-export { create_session_message_store } from "./session/storage/SessionMessageStoreFactory.js";
 export type { AgentStorage } from "./types/agent/AgentStorage.js";
 export { Session } from "./session/Session.js";
 export { SessionHooks, SessionHookScope } from "./session/SessionHooks.js";
@@ -102,16 +94,16 @@ export type {
 } from "./types/agent/SessionTypes.js";
 export type {
   ListSessionMessagesInput,
-  SessionActionMessage,
-  SessionAssistantDataPart,
-  SessionAssistantFilePart,
-  SessionAssistantInteractionPart,
-  SessionAssistantMessage,
-  SessionAssistantMessagePart,
-  SessionAssistantReasoningPart,
-  SessionAssistantTextPart,
-  SessionAssistantToolPart,
-  SessionErrorMessage,
+  SessionAgentActionPart,
+  SessionAgentDataPart,
+  SessionAgentFilePart,
+  SessionAgentInteractionPart,
+  SessionAgentMessage,
+  SessionAgentMessagePart,
+  SessionAgentReasoningPart,
+  SessionAgentTextPart,
+  SessionAgentToolPart,
+  SessionAgentErrorPart,
   SessionMessage,
   SessionMessagePage,
   SessionUserDataPart,
@@ -134,13 +126,6 @@ export {
 } from "./session/messages/SessionTurnFileDiffData.js";
 export { to_session_message_timeline_events } from "./session/browse/SessionMessageTimeline.js";
 export { SessionAssistantOutputAdapter } from "./session/execution/SessionAssistantOutputAdapter.js";
-export type {
-  SessionContextSnapshot,
-  SessionMessageStorageStats,
-  SessionSegmentRange,
-  SessionSegmentSnapshot,
-  SessionSegmentSummary,
-} from "./types/session/SessionSegment.js";
 export {
   is_session_mutation,
 } from "@downcity/type";
@@ -148,7 +133,6 @@ export type {
   ModelRequestKind,
 } from "@downcity/type";
 export type {
-  SessionCompactMutation,
   SessionConfigMutation,
   SessionDeltaMutation,
   SessionMessageMutation,
@@ -203,25 +187,25 @@ export type {
   AgentSessionActionRecord,
   AgentSessionActionState,
 } from "./types/sdk/AgentSessionAction.js";
-export type { AgentSessionPromptInput } from "./types/sdk/AgentSessionPrompt.js";
+export type {
+  AgentSessionPromptContent,
+  AgentSessionPromptInput,
+} from "./types/sdk/AgentSessionPrompt.js";
 export { is_agent_session_prompt_input_empty } from "./types/sdk/AgentSessionPrompt.js";
 export type {
-  SessionPromptPart,
-  SessionAssistantResultPart,
-  SessionTextInputPart,
-  SessionContextInputPart,
-  SessionFileInputPart,
-  SessionDataInputPart,
+  SessionAgentContent,
+  SessionContextContent,
+  SessionDataContent,
+  SessionFileContent,
+  SessionModelUserContent,
+  SessionTextContent,
+  SessionUserContent,
 } from "@downcity/type";
 export type { AgentSessionStopResult } from "./types/sdk/AgentSessionStop.js";
 export type {
   AgentSessionTurnHandle,
   AgentSessionTurnResult,
 } from "./types/sdk/AgentSessionTurn.js";
-export type {
-  AgentSessionCompactHandle,
-  AgentSessionCompactResult,
-} from "./types/sdk/AgentSessionCompact.js";
 export type { SessionPort } from "./types/session/SessionPort.js";
 export type {
   ActionResult,
@@ -231,30 +215,39 @@ export type {
 // Session 与即时执行集成
 export { Executor } from "./executor/Executor.js";
 export { DefaultSessionComposer } from "./session/DefaultSessionComposer.js";
+export { FullHistoryContextPolicy } from "./session/composer/policies/FullHistoryContextPolicy.js";
+export { AdaptivePartContextPolicy } from "./session/composer/policies/AdaptivePartContextPolicy.js";
 export { SessionMessages } from "./session/SessionMessages.js";
 export type {
-  AppendCompletedAssistantMessageInput,
-  AppendExternalSessionAssistantMessageInput,
+  AppendCompletedAgentMessageInput,
+  AppendExternalSessionAgentMessageInput,
   AppendExternalSessionUserMessageInput,
-  AppendSessionErrorMessageInput,
+  AppendSessionAgentErrorPartInput,
   AppendSessionPromptMessageInput,
   AppendSessionUserMessageInput,
-  OpenSessionActionMessageInput,
-  OpenSessionAssistantMessageInput,
+  OpenSessionAgentActionPartInput,
+  OpenSessionAgentMessageInput,
   SessionMessagesOptions,
 } from "./types/session/SessionMessages.js";
 export type {
   SessionComposer,
-  SessionCompactionInput,
-  SessionCompactionPlan,
   SessionComposeIdentity,
   SessionComposeInput,
   SessionComposeState,
   SessionComposeTurn,
+  SessionComposerInitializeInput,
+  SessionContextRecoveryInput,
   SessionStepInput,
 } from "./types/session/SessionComposer.js";
-export { DefaultSessionSystemComposer } from "./executor/composer/system/default/DefaultSessionSystemComposer.js";
-export { resolve_session_system_messages } from "./executor/composer/system/default/SystemDomain.js";
+export type {
+  SessionContextPolicy,
+  SessionContextPolicyInitializeInput,
+  SessionContextPolicyInput,
+  SessionContextPolicyRecoveryInput,
+  SessionContextRecoveryReason,
+  SessionResolvedContext,
+  SessionResolvedContextDiagnostics,
+} from "./types/session/SessionContextPolicy.js";
 export type {
   SessionExecutor,
   SessionTurnExecutionResult,
@@ -275,7 +268,6 @@ export type {
   SessionActionStatus,
 } from "@downcity/type";
 export type { SessionSystemMessage } from "./executor/types/SessionPrompts.js";
-export { transform_prompts_into_system_messages } from "./executor/composer/system/default/PromptRenderer.js";
 export {
   extract_session_message_text,
   extract_session_tool_calls,

package/src/session/DefaultSessionComposer.ts

@@ -1,20 +1,17 @@
 /**
  * 默认 Session Composer。
  *
- * 负责把 Session 的只读状态与 canonical Message 快照组装为模型输入；
- * 压缩只生成计划，实际 Segment 提交仍由 SessionMessages 负责。
+ * 负责把 Session 运行快照与 Context Policy 结果组装为最终模型输入。
  */
 
 import { build_session_system_blocks } from "@/session/SessionSystem.js";
-import { compose_session_compaction } from "@/session/messages/SessionMessageCompaction.js";
-import { session_context_to_model_messages } from "@executor/messages/SessionModelMessages.js";
 import type {
   SessionComposer,
-  SessionCompactionInput,
-  SessionCompactionPlan,
   SessionComposeInput,
   SessionStepInput,
 } from "@/types/session/SessionComposer.js";
+import type { SessionContextPolicy } from "@/types/session/SessionContextPolicy.js";
+import { AdaptivePartContextPolicy } from "@/session/composer/policies/AdaptivePartContextPolicy.js";
 import type { SessionHookContextBlock } from "@downcity/type";
 import type { ModelMessage } from "@downcity/type";
 
@@ -60,6 +57,23 @@ function inject_plugin_context(
 export class DefaultSessionComposer implements SessionComposer {
   readonly name = "default_session";
 
+  /** 当前 Composer 使用的上下文策略。 */
+  private readonly context_policy: SessionContextPolicy;
+
+  constructor(options?: {
+    /** 生成模型历史的上下文策略。 */
+    context_policy?: SessionContextPolicy;
+  }) {
+    this.context_policy = options?.context_policy || new AdaptivePartContextPolicy();
+  }
+
+  /** 初始化内部 Context Policy 的派生 schema。 */
+  async initialize(input: Parameters<SessionComposer["initialize"]>[0]): Promise<void> {
+    await this.context_policy.initialize({
+      storage: input.storage.composer_storage(this.context_policy.name),
+    });
+  }
+
   /** 组装当前 Step 的 system、history 与 tools。 */
   async compose(input: SessionComposeInput): Promise<SessionStepInput> {
     const system_blocks = await build_session_system_blocks({
@@ -79,42 +93,31 @@ export class DefaultSessionComposer implements SessionComposer {
       ],
     });
 
-    const messages = await session_context_to_model_messages(
-      input.history,
-      input.session.project_root,
-    );
+    const context = await this.context_policy.resolve({
+      storage: input.storage.composer_storage(this.context_policy.name),
+      project_root: input.session.project_root,
+    });
+    system_blocks.push(...(context.system_blocks ?? []));
     return {
       system: system_blocks.map((block) => ({
         role: "system" as const,
         content: block.content,
       })),
       system_blocks,
-      messages: inject_plugin_context(messages, input.state.plugin_context_blocks ?? []),
+      messages: inject_plugin_context(context.messages, input.state.plugin_context_blocks ?? []),
       tools: { ...input.state.tools },
+      context_diagnostics: context.diagnostics,
     };
   }
 
-  /** 生成等待 SessionMessages 提交的压缩计划。 */
-  async compact(
-    input: SessionCompactionInput,
-  ): Promise<SessionCompactionPlan | null> {
-    if (!input.model) return null;
-    return await compose_session_compaction({
-      session_id: input.session.session_id,
-      snapshot: input.history,
+  /** 把上下文恢复委托给当前 Policy。 */
+  async recover_context(input: Parameters<SessionComposer["recover_context"]>[0]): Promise<boolean> {
+    return await this.context_policy.recover({
+      storage: input.storage.composer_storage(this.context_policy.name),
+      project_root: input.session.project_root,
+      reason: input.reason,
       model: input.model,
       on_model_request_failure: input.on_model_request_failure,
     });
   }
-
-  /** 判断错误是否属于模型上下文超限。 */
-  should_compact(error: unknown): boolean {
-    const message = String(error ?? "");
-    return (
-      message.includes("context_length") ||
-      message.includes("too long") ||
-      message.includes("maximum context") ||
-      message.includes("context window")
-    );
-  }
 }