惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

C
CERT Recently Published Vulnerability Notes
U
Unit 42
T
The Blog of Author Tim Ferriss
H
Hackread – Cybersecurity News, Data Breaches, AI and More
B
Blog RSS Feed
Microsoft Azure Blog
Microsoft Azure Blog
Threat Intelligence Blog | Flashpoint
Threat Intelligence Blog | Flashpoint
S
Securelist
L
Lohrmann on Cybersecurity
Blog — PlanetScale
Blog — PlanetScale
Recorded Future
Recorded Future
D
DataBreaches.Net
Spread Privacy
Spread Privacy
T
Threat Research - Cisco Blogs
I
Intezer
P
Palo Alto Networks Blog
Simon Willison's Weblog
Simon Willison's Weblog
cs.CL updates on arXiv.org
cs.CL updates on arXiv.org
I
InfoQ
宝玉的分享
宝玉的分享
Security Latest
Security Latest
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
T
Threatpost
Cisco Talos Blog
Cisco Talos Blog
P
Proofpoint News Feed
博客园 - 司徒正美
H
Hacker News: Front Page
Y
Y Combinator Blog
爱范儿
爱范儿
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
cs.AI updates on arXiv.org
cs.AI updates on arXiv.org
NISL@THU
NISL@THU
月光博客
月光博客
有赞技术团队
有赞技术团队
Cloudbric
Cloudbric
酷 壳 – CoolShell
酷 壳 – CoolShell
G
Google Developers Blog
A
Arctic Wolf
博客园 - 【当耐特】
W
WeLiveSecurity
V
Visual Studio Blog
Exploit-DB.com RSS Feed
Exploit-DB.com RSS Feed
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
cs.CV updates on arXiv.org
cs.CV updates on arXiv.org
V
V2EX
C
Cyber Attacks, Cyber Crime and Cyber Security
S
SegmentFault 最新的问题
The GitHub Blog
The GitHub Blog
The Cloudflare Blog
Stack Overflow Blog
Stack Overflow Blog

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4 test: trim doctor command hotspots · openclaw/openclaw@c66f16a test: isolate agent auth and spawn hotspots · openclaw/openclaw@9285935 test: stabilize MCP startup disposal race · openclaw/openclaw@dd9d2eb test: merge browser contract server suites · openclaw/openclaw@5817a76 test: narrow ollama provider discovery setup · openclaw/openclaw@a0d9598 build: declare qa-lab aimock runtime dependency · openclaw/openclaw@24431e5 test: speed up safe-bins exec harness · openclaw/openclaw@ee856ab test: preserve tool helpers in embedded runner mocks · openclaw/openclaw@acd86a0 refactor: move memory embeddings into provider plugins · openclaw/openclaw@77e6e4c test: reuse system-run temp fixtures · openclaw/openclaw@7e9ff0f test: trim hotspot wait overhead · openclaw/openclaw@12a59b0 Check: avoid duplicate boundary prep · openclaw/openclaw@baf11b8 test: reduce hotspot fixture overhead · openclaw/openclaw@3a59edd feat(ui): overhaul settings and slash command UX (#67819) thanks @Bun… · openclaw/openclaw@2cfb660 QA Matrix: exit cleanly on failure · openclaw/openclaw@42805d2 QA Matrix: isolate scenario coverage · openclaw/openclaw@7e659e1 Matrix: refresh crypto bootstrap state · openclaw/openclaw@94081d8 QA Lab: add provider registry · openclaw/openclaw@bb7e982 Matrix: add plugin changelog · openclaw/openclaw@4acab55 test: trim more hotspot overhead · openclaw/openclaw@f485311 test: trim remaining hotspot tests · openclaw/openclaw@6ba8626 test: narrow hotspot mocks · openclaw/openclaw@dbc8179 test: isolate gemini embedding request helpers · openclaw/openclaw@cd330f5 test: trim memory and mcp hotspots · openclaw/openclaw@fd48dfa test: slim provider registry mocks · openclaw/openclaw@2e08c77 test: harden Parallels update smoke · openclaw/openclaw@1a98090 feat: default Anthropic to Opus 4.7 · openclaw/openclaw@628b454 fix: harden node-host shell payload mutability checks · openclaw/openclaw@75c551e fix: land node-host approval binding for native binaries (#66731) (th… · openclaw/openclaw@29919bb CI: add daily schedule to CodeQL workflow (#67645) · openclaw/openclaw@69d25f5 fix(gateway): capture config hash after plugin auto-enable to prevent… · openclaw/openclaw@8c11210 fix: repair sanitized replay tool results before send (#67620) (thank… · openclaw/openclaw@c3c7a99 fix: restrict HTML timeout short-circuit to transient statuses · openclaw/openclaw@de129a6 fix: keep TUI watchdog bound to active run (#67401) (thanks @xantorres) · openclaw/openclaw@3525273 Gateway/skills: dedupe skills prefix-match + drop dead fallback on log · openclaw/openclaw@d7f489f Extensions/lmstudio: back off inference preload after consecutive fai… · openclaw/openclaw@b555214 TUI/streaming: add watchdog that resets the activity indicator after … · openclaw/openclaw@f44ab20 Agents/tool-loop: enable unknown-tool stream guard by default · openclaw/openclaw@36ed367 Gateway/skills: invalidate session skills snapshot on config write · openclaw/openclaw@b23d59a fix: classify HTML provider error pages correctly (#67642) (thanks @s… · openclaw/openclaw@e588e90 fix(skills): remove unused model-usage import (#67641) · openclaw/openclaw@55f05df docs(changelog): credit codex fix superseded PRs · openclaw/openclaw@e485f24 fix(openai-codex): normalize stale transport metadata in resolution a… · openclaw/openclaw@90801ba CI: pin Docker-related GitHub Actions (#67632) · openclaw/openclaw@f697b01 Android: modernize WebView and discovery API usage (#67627) · openclaw/openclaw@44a6e50 fix(deps): bump hono to 4.12.14 and @hono/node-server to 1.19.14 (GHS… · openclaw/openclaw@fbccc18 fix(deps): bump dompurify to 3.4.0 (#67614) · openclaw/openclaw@2c2dc00 CI: add explicit permissions to all workflow jobs (fixes code-scannin… · openclaw/openclaw@01b7516 fix: register bundled TTS providers and route overrides correctly (#6… · openclaw/openclaw@6ea3cdd fix: align host tilde paths with OS home (#62804) (thanks @stainlu) · openclaw/openclaw@ecfaf64 fix: flush creds queue before reconnect socket open (#67464) (thanks … · openclaw/openclaw@405c63f fix: strip standalone <function> tool call tags from visible text (#6… · openclaw/openclaw@78df859 fix(agents): preserve cli session metadata before transcript persist … · openclaw/openclaw@898fd04 docs(changelog): move cli transcript entry · openclaw/openclaw@c1817c6 fix(agents): normalize cli transcript api field · openclaw/openclaw@3a3fae0 docs(changelog): note cli transcript persistence · openclaw/openclaw@6c343f1 fix(agents): persist cli transcript turns · openclaw/openclaw@b8ef507 fix(msteams): harden security-sensitive flows (#65841) · openclaw/openclaw@c56b56e [Dashboard] Fix exec approval modal overflow for long command content… · openclaw/openclaw@053c5b0 Docs: remove QA changelog entry · openclaw/openclaw@7fd5771 QA: fix private runtime source loading (#67428) · openclaw/openclaw@d5933af docs(gateway): correct protocol.md schema path, hello-ok example, aut… · openclaw/openclaw@489404d CI: pin Node 22 runners to 22.18.0 · openclaw/openclaw@4ffa621 models.authStatus: normalize provider ids + tighten env-backed escape… · openclaw/openclaw@f2fdb9d Update CHANGELOG.md · openclaw/openclaw@7694a92 test(parallels): clean up npm update guard jobs · openclaw/openclaw@045ea7b Plugins: prefer scanDir override paths · openclaw/openclaw@b2974da fix(dreaming): default storage.mode to "separate" so phase blocks sto… · openclaw/openclaw@8c392f0 fix(memory-core): skip dreaming transcript ingestion via session stor… · openclaw/openclaw@a1b01f0 fix: dedupe replayed exec.finished node events (#67281) · openclaw/openclaw@5dcf526
refactor: guard reply session initialization (#96218) · openclaw/openclaw@95e37f8
jalehman · 2026-06-24 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -2,6 +2,7 @@

22

import type { SessionEntry } from "../../config/sessions/types.js";

33

import { createLazyImportLoader } from "../../shared/lazy-promise.js";

44

import { setAbortMemory } from "./abort-primitives.js";

5+

import type { ReplySessionEntryHandle } from "./session-entry-handle.js";

56
67

const sessionAccessorRuntimeLoader = createLazyImportLoader(

78

() => import("../../config/sessions/session-accessor.js"),

@@ -16,6 +17,7 @@ export async function applySessionHints(params: {

1617

baseBody: string;

1718

abortedLastRun: boolean;

1819

sessionEntry?: SessionEntry;

20+

sessionEntryHandle?: ReplySessionEntryHandle;

1921

sessionStore?: Record<string, SessionEntry>;

2022

sessionKey?: string;

2123

storePath?: string;

@@ -28,11 +30,13 @@ export async function applySessionHints(params: {

2830

if (abortedHint) {

2931

prefixedBodyBase = `${abortedHint}\n\n${prefixedBodyBase}`;

3032

// The abort hint is one-shot; clear durable state once it is added.

31-

if (params.sessionEntry && params.sessionStore && params.sessionKey) {

33+

const sessionEntry = params.sessionEntryHandle?.getCurrent() ?? params.sessionEntry;

34+

if (sessionEntry && params.sessionEntryHandle && params.sessionKey) {

3235

const updatedAt = Date.now();

33-

params.sessionEntry.abortedLastRun = false;

34-

params.sessionEntry.updatedAt = updatedAt;

35-

params.sessionStore[params.sessionKey] = params.sessionEntry;

36+

params.sessionEntryHandle.patchCurrent({

37+

abortedLastRun: false,

38+

updatedAt,

39+

});

3640

if (params.storePath) {

3741

const sessionKey = params.sessionKey;

3842

const { patchSessionEntry } = await loadSessionAccessorRuntime();

@@ -45,7 +49,27 @@ export async function applySessionHints(params: {

4549

abortedLastRun: false,

4650

updatedAt,

4751

}),

48-

{ fallbackEntry: params.sessionEntry },

52+

{ fallbackEntry: params.sessionEntryHandle.getCurrent() ?? sessionEntry },

53+

);

54+

}

55+

} else if (sessionEntry && params.sessionStore && params.sessionKey) {

56+

const updatedAt = Date.now();

57+

sessionEntry.abortedLastRun = false;

58+

sessionEntry.updatedAt = updatedAt;

59+

params.sessionStore[params.sessionKey] = sessionEntry;

60+

if (params.storePath) {

61+

const sessionKey = params.sessionKey;

62+

const { patchSessionEntry } = await loadSessionAccessorRuntime();

63+

await patchSessionEntry(

64+

{

65+

storePath: params.storePath,

66+

sessionKey,

67+

},

68+

() => ({

69+

abortedLastRun: false,

70+

updatedAt,

71+

}),

72+

{ fallbackEntry: sessionEntry },

4973

);

5074

}

5175

} else if (params.abortKey) {

Original file line numberDiff line numberDiff line change

@@ -19,6 +19,7 @@ import { isFormattedGoalContinuationPrompt } from "./commands-goal.js";

1919

import { parseSoftResetCommand } from "./commands-reset-mode.js";

2020

import type { CommandContext } from "./commands-types.js";

2121

import { stripMentions, stripStructuralPrefixes } from "./mentions.js";

22+

import { createReplySessionEntryHandle } from "./session-entry-handle.js";

2223

import type { SessionInitResult } from "./session.js";

2324
2425

const COMPLETE_REPLY_CONFIG_SYMBOL = Symbol.for("openclaw.reply.complete-config");

@@ -284,6 +285,11 @@ export function initFastReplySessionState(params: {

284285

: {}),

285286

};

286287

sessionStore[sessionKey] = sessionEntry;

288+

const sessionEntryHandle = createReplySessionEntryHandle({

289+

sessionEntry,

290+

sessionKey,

291+

sessionStore,

292+

});

287293

const sessionCtx: TemplateContext = {

288294

...ctx,

289295

SessionKey: sessionKey,

@@ -294,6 +300,7 @@ export function initFastReplySessionState(params: {

294300

return {

295301

sessionCtx,

296302

sessionEntry,

303+

sessionEntryHandle,

297304

sessionStore,

298305

sessionKey,

299306

sessionId,

Original file line numberDiff line numberDiff line change

@@ -100,6 +100,7 @@ import {

100100

import { resolveReplyToMode } from "./reply-threading.js";

101101

import { resolveRoutedDeliveryThreadId } from "./routed-delivery-thread.js";

102102

import { resolveRuntimePolicySessionKey } from "./runtime-policy-session-key.js";

103+

import type { ReplySessionEntryHandle } from "./session-entry-handle.js";

103104

import { resolveBareSessionResetPromptState } from "./session-reset-prompt.js";

104105

import { resolveBareResetBootstrapFileAccess } from "./session-reset-prompt.js";

105106

import { drainFormattedSystemEvents } from "./session-system-events.js";

@@ -444,6 +445,7 @@ type RunPreparedReplyParams = {

444445

resetTriggered: boolean;

445446

systemSent: boolean;

446447

sessionEntry?: SessionEntry;

448+

sessionEntryHandle?: ReplySessionEntryHandle;

447449

sessionStore?: Record<string, SessionEntry>;

448450

sessionKey: string;

449451

sessionId?: string;

@@ -491,6 +493,7 @@ export async function runPreparedReply(

491493

sessionId,

492494

storePath,

493495

workspaceDir,

496+

sessionEntryHandle,

494497

sessionStore,

495498

} = params;

496499

const runtimePolicySessionKey = resolveRuntimePolicySessionKey({

@@ -770,11 +773,13 @@ export async function runPreparedReply(

770773

baseBody: effectiveBaseBody,

771774

abortedLastRun,

772775

sessionEntry,

776+

sessionEntryHandle,

773777

sessionStore,

774778

sessionKey,

775779

storePath,

776780

abortKey: command.abortKey,

777781

});

782+

sessionEntry = sessionEntryHandle?.getCurrent() ?? sessionEntry;

778783

const isGroupSession = sessionEntry?.chatType === "group" || sessionEntry?.chatType === "channel";

779784

const isMainSession = !isGroupSession && sessionKey === normalizeMainKey(sessionCfg?.mainKey);

780785

// Extract first-token think hint from the user body BEFORE prepending system events.

@@ -854,6 +859,7 @@ export async function runPreparedReply(

854859

const { ensureSkillSnapshot } = await loadSessionUpdatesRuntime();

855860

return await ensureSkillSnapshot({

856861

sessionEntry,

862+

sessionEntryHandle,

857863

sessionStore,

858864

sessionKey,

859865

storePath,

@@ -865,6 +871,9 @@ export async function runPreparedReply(

865871

});

866872

});

867873

sessionEntry = skillResult.sessionEntry ?? sessionEntry;

874+

if (sessionEntry) {

875+

sessionEntryHandle?.replaceCurrent(sessionEntry);

876+

}

868877

const skillsSnapshot = skillResult.skillsSnapshot;

869878

let {

870879

prefixedCommandBody,

Original file line numberDiff line numberDiff line change

@@ -494,6 +494,7 @@ export async function getReplyFromConfig(

494494

const {

495495

sessionCtx,

496496

sessionEntry,

497+

sessionEntryHandle,

497498

previousSessionEntry,

498499

sessionStore,

499500

sessionKey,

@@ -534,6 +535,7 @@ export async function getReplyFromConfig(

534535

sessionEntry.pendingFinalDeliveryAttemptCount = undefined;

535536

sessionEntry.pendingFinalDeliveryLastError = undefined;

536537

sessionEntry.pendingFinalDeliveryContext = undefined;

538+

sessionEntryHandle.replaceCurrent(sessionEntry);

537539

if (sessionKey && sessionStore) {

538540

sessionStore[sessionKey] = sessionEntry;

539541

}

@@ -570,6 +572,7 @@ export async function getReplyFromConfig(

570572

sessionCtx,

571573

ctx: finalized,

572574

sessionEntry,

575+

sessionEntryHandle,

573576

sessionStore,

574577

sessionKey,

575578

storePath,

@@ -741,6 +744,7 @@ export async function getReplyFromConfig(

741744

resetTriggered,

742745

systemSent,

743746

sessionEntry,

747+

sessionEntryHandle,

744748

sessionStore,

745749

sessionKey,

746750

sessionId,

Original file line numberDiff line numberDiff line change

@@ -184,7 +184,7 @@ export function resolveLastToRaw(params: {

184184

export function maybeRetireLegacyMainDeliveryRoute(params: {

185185

sessionCfg: { dmScope?: string } | undefined;

186186

sessionKey: string;

187-

sessionStore: Record<string, SessionEntry>;

187+

legacyMain?: SessionEntry;

188188

agentId: string;

189189

mainKey: string;

190190

isGroup: boolean;

@@ -201,7 +201,7 @@ export function maybeRetireLegacyMainDeliveryRoute(params: {

201201

if (params.sessionKey === canonicalMainSessionKey) {

202202

return undefined;

203203

}

204-

const legacyMain = params.sessionStore[canonicalMainSessionKey];

204+

const legacyMain = params.legacyMain;

205205

if (!legacyMain) {

206206

return undefined;

207207

}

Original file line numberDiff line numberDiff line change

@@ -0,0 +1,42 @@

1+

// Narrow mutable handle for the active reply session entry.

2+

import type { SessionEntry } from "../../config/sessions.js";

3+
4+

export type ReplySessionEntryHandle = {

5+

get(sessionKey: string): SessionEntry | undefined;

6+

getCurrent(): SessionEntry | undefined;

7+

patchCurrent(patch: Partial<SessionEntry>): SessionEntry | undefined;

8+

replaceCurrent(entry: SessionEntry): void;

9+

set(sessionKey: string, entry: SessionEntry): void;

10+

toCompatSessionStore(): Record<string, SessionEntry>;

11+

};

12+
13+

export function createReplySessionEntryHandle(params: {

14+

sessionEntry: SessionEntry;

15+

sessionKey: string;

16+

sessionStore?: Record<string, SessionEntry>;

17+

}): ReplySessionEntryHandle {

18+

const entries = params.sessionStore ?? { [params.sessionKey]: params.sessionEntry };

19+

let currentEntry = params.sessionEntry;

20+

entries[params.sessionKey] = currentEntry;

21+
22+

return {

23+

get: (sessionKey) => entries[sessionKey],

24+

getCurrent: () => currentEntry,

25+

patchCurrent: (patch) => {

26+

currentEntry = { ...currentEntry, ...patch };

27+

entries[params.sessionKey] = currentEntry;

28+

return currentEntry;

29+

},

30+

replaceCurrent: (entry) => {

31+

currentEntry = entry;

32+

entries[params.sessionKey] = entry;

33+

},

34+

set: (sessionKey, entry) => {

35+

entries[sessionKey] = entry;

36+

if (sessionKey === params.sessionKey) {

37+

currentEntry = entry;

38+

}

39+

},

40+

toCompatSessionStore: () => entries,

41+

};

42+

}

Original file line numberDiff line numberDiff line change

@@ -0,0 +1,62 @@

1+

// Prepares parent-context fork metadata for guarded reply session initialization.

2+

import path from "node:path";

3+

import type { SessionEntry } from "../../config/sessions.js";

4+

import { forkSessionFromParent, resolveParentForkDecision } from "./session-fork.js";

5+
6+

export async function prepareReplySessionParentFork(params: {

7+

agentId: string;

8+

alreadyForked: boolean;

9+

parentSessionKey?: string;

10+

readEntry: (sessionKey: string) => SessionEntry | undefined;

11+

sessionEntry: SessionEntry;

12+

sessionKey: string;

13+

storePath: string;

14+

warn: (message: string) => void;

15+

}): Promise<SessionEntry> {

16+

if (

17+

!params.parentSessionKey ||

18+

params.parentSessionKey === params.sessionKey ||

19+

params.alreadyForked

20+

) {

21+

return params.sessionEntry;

22+

}

23+

const parentEntry = params.readEntry(params.parentSessionKey);

24+

if (!parentEntry?.sessionId) {

25+

return params.sessionEntry;

26+

}

27+

const decision = await resolveParentForkDecision({

28+

parentEntry,

29+

agentId: params.agentId,

30+

storePath: params.storePath,

31+

});

32+

if (decision.status === "skip") {

33+

// The parent branch is too large to inherit usefully. Start fresh and

34+

// mark as handled so the thread does not retry this decision every turn.

35+

params.warn(

36+

`skipping parent fork (parent too large): parentKey=${params.parentSessionKey} → sessionKey=${params.sessionKey} ` +

37+

`parentTokens=${decision.parentTokens} maxTokens=${decision.maxTokens}`,

38+

);

39+

return { ...params.sessionEntry, forkedFromParent: true };

40+

}

41+

const fork = await forkSessionFromParent({

42+

parentEntry,

43+

agentId: params.agentId,

44+

sessionsDir: path.dirname(params.storePath),

45+

});

46+

if (!fork) {

47+

return params.sessionEntry;

48+

}

49+

params.warn(

50+

`forking from parent session: parentKey=${params.parentSessionKey} → sessionKey=${params.sessionKey} ` +

51+

`parentTokens=${decision.parentTokens ?? "unknown"}`,

52+

);

53+

params.warn(`forked session created: file=${fork.sessionFile}`);

54+

return {

55+

...params.sessionEntry,

56+

sessionId: fork.sessionId,

57+

sessionFile: fork.sessionFile,

58+

forkedFromParent: true,

59+

totalTokens: undefined,

60+

totalTokensFresh: false,

61+

};

62+

}

Original file line numberDiff line numberDiff line change

@@ -18,6 +18,7 @@ import {

1818

type ModelAliasIndex,

1919

type ModelDirectiveSelection,

2020

} from "./model-selection-directive.js";

21+

import type { ReplySessionEntryHandle } from "./session-entry-handle.js";

2122
2223

/** Result of applying a reset-message model override. */

2324

type ResetModelResult = {

@@ -109,12 +110,14 @@ function buildSelectionFromExplicit(params: {

109110

function applySelectionToSession(params: {

110111

selection: ModelDirectiveSelection;

111112

sessionEntry?: SessionEntry;

113+

sessionEntryHandle?: ReplySessionEntryHandle;

112114

sessionStore?: Record<string, SessionEntry>;

113115

sessionKey?: string;

114116

storePath?: string;

115117

}) {

116-

const { selection, sessionEntry, sessionStore, sessionKey, storePath } = params;

117-

if (!sessionEntry || !sessionStore || !sessionKey) {

118+

const { selection, sessionEntryHandle, sessionStore, sessionKey, storePath } = params;

119+

const sessionEntry = sessionEntryHandle?.getCurrent() ?? params.sessionEntry;

120+

if (!sessionEntry || !sessionKey) {

118121

return;

119122

}

120123

const { updated } = applyModelOverrideToSessionEntry({

@@ -124,7 +127,11 @@ function applySelectionToSession(params: {

124127

if (!updated) {

125128

return;

126129

}

127-

sessionStore[sessionKey] = sessionEntry;

130+

if (sessionEntryHandle) {

131+

sessionEntryHandle.replaceCurrent(sessionEntry);

132+

} else if (sessionStore) {

133+

sessionStore[sessionKey] = sessionEntry;

134+

}

128135

if (storePath) {

129136

void import("../../config/sessions/session-accessor.js")

130137

.then(({ replaceSessionEntry }) =>

@@ -146,6 +153,7 @@ export async function applyResetModelOverride(params: {

146153

sessionCtx: TemplateContext;

147154

ctx: MsgContext;

148155

sessionEntry?: SessionEntry;

156+

sessionEntryHandle?: ReplySessionEntryHandle;

149157

sessionStore?: Record<string, SessionEntry>;

150158

sessionKey?: string;

151159

storePath?: string;

@@ -248,6 +256,7 @@ export async function applyResetModelOverride(params: {

248256

applySelectionToSession({

249257

selection,

250258

sessionEntry: params.sessionEntry,

259+

sessionEntryHandle: params.sessionEntryHandle,

251260

sessionStore: params.sessionStore,

252261

sessionKey: params.sessionKey,

253262

storePath: params.storePath,