Skip to content

refactor(session): 简化并统一会话系统消息的处理逻辑 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qorzj merged 1 commit into from
May 14, 2026
Merged

refactor(session): 简化并统一会话系统消息的处理逻辑 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 13 additions & 25 deletions src/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@ export type MessageMeta = {
asThinking?: boolean;
isSummary?: boolean;
isModelChange?: boolean;
modelConfig?: {
model: string;
thinkingEnabled: boolean;
reasoningEffort?: string;
};
skill?: SkillInfo;
};

Expand Down Expand Up @@ -778,6 +773,12 @@ The candidate skills are as follows:\n\n`;
this.activeSessionId = sessionId;
}

addSessionSystemMessage(sessionId: string, content: string, meta?: MessageMeta): void {
const message = this.buildSystemMessage(sessionId, content, meta);
this.appendSessionMessage(sessionId, message);
this.onAssistantMessage(message, false);
}

async handleUserPrompt(userPrompt: UserPromptContent): Promise<void> {
const controller = new AbortController();
this.activePromptController = controller;
Expand Down Expand Up @@ -1332,25 +1333,6 @@ ${skillMd}
return messages;
}

addSessionSystemMessage(sessionId: string, content: string, meta?: MessageMeta): void {
const now = new Date().toISOString();
const message: SessionMessage = {
id: crypto.randomUUID(),
sessionId,
role: "system",
content,
contentParams: null,
messageParams: null,
compacted: false,
visible: true,
createTime: now,
updateTime: now,
meta,
};
this.appendSessionMessage(sessionId, message);
this.onAssistantMessage(message, false);
}

private normalizeSessionMessage(message: SessionMessage): SessionMessage {
if (message.role !== "tool") {
return message;
Expand Down Expand Up @@ -1560,7 +1542,12 @@ ${skillMd}
return this.readNonEmptyFile(path.join(os.homedir(), ".deepcode", "AGENTS.md"));
}

private buildSystemMessage(sessionId: string, content: string, contentParams: unknown | null = null): SessionMessage {
private buildSystemMessage(
sessionId: string,
content: string,
contentParams: unknown | null = null,
meta?: MessageMeta
): SessionMessage {
const now = new Date().toISOString();
return {
id: crypto.randomUUID(),
Expand All @@ -1573,6 +1560,7 @@ ${skillMd}
visible: false,
createTime: now,
updateTime: now,
meta,
};
}

Expand Down
7 changes: 1 addition & 6 deletions src/ui/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,8 @@ export function App({ projectRoot, version = "", onRestart }: AppProps): React.R
const activeSessionId = sessionManager.getActiveSessionId();
const meta: MessageMeta = {
isModelChange: true,
modelConfig: {
model: selection.model,
thinkingEnabled: selection.thinkingEnabled,
reasoningEffort: selection.reasoningEffort,
},
};
const content = `/model\n└ Set model to ${selection.model}`;
const content = `/model\n└ Set model to ${selection.model} (${selection?.reasoningEffort || "no thinking"})`;

if (activeSessionId) {
sessionManager.addSessionSystemMessage(activeSessionId, content, meta);
Expand Down
9 changes: 1 addition & 8 deletions src/ui/MessageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,7 @@ export function MessageView({ message, collapsed }: Props): React.ReactElement |
<Text color="#229ac3">{`>`}</Text>
</Box>
<Box flexGrow={1} flexDirection="column">
<Text color="cyan">/model</Text>
<Text color="cyan">
└ Set model to{" "}
<Text bold color="#229ac3">
{message.meta.modelConfig?.model}
</Text>
<Text dimColor>{` (${message.meta.modelConfig?.reasoningEffort || "normal"} effort)`}</Text>
</Text>
<Text color="#229ac3">{message.content}</Text>
</Box>
</Box>
);
Expand Down