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

推荐订阅源

V
Visual Studio Blog
量子位
大猫的无限游戏
大猫的无限游戏
Hugging Face - Blog
Hugging Face - Blog
S
SegmentFault 最新的问题
Blog — PlanetScale
Blog — PlanetScale
月光博客
月光博客
Google DeepMind News
Google DeepMind News
小众软件
小众软件
WordPress大学
WordPress大学
宝玉的分享
宝玉的分享
MongoDB | Blog
MongoDB | Blog
B
Blog RSS Feed
博客园 - Franky
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
B
Blog
博客园 - 聂微东
The GitHub Blog
The GitHub Blog
Recent Announcements
Recent Announcements
Y
Y Combinator Blog
Microsoft Security Blog
Microsoft Security Blog
雷峰网
雷峰网
Jina AI
Jina AI
酷 壳 – CoolShell
酷 壳 – CoolShell

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
fix(agent): support explicit CLI session keys (#85121) · ...
Kaspre · 2026-05-22 · via Recent Commits to openclaw:main

@@ -22,9 +22,12 @@ import { buildOutboundSessionContext } from "../infra/outbound/session-context.j

2222

import { createSubsystemLogger } from "../logging/subsystem.js";

2323

import { loadManifestMetadataSnapshot } from "../plugins/manifest-contract-eligibility.js";

2424

import {

25+

classifySessionKeyShape,

26+

isUnscopedSessionKeySentinel,

2527

isSubagentSessionKey,

2628

normalizeAgentId,

2729

resolveAgentIdFromSessionKey,

30+

scopeLegacySessionKeyToAgent,

2831

} from "../routing/session-key.js";

2932

import { defaultRuntime, type RuntimeEnv } from "../runtime.js";

3033

import { applyVerboseOverride } from "../sessions/level-overrides.js";

@@ -48,6 +51,7 @@ import {

4851

markAutoFallbackPrimaryProbe,

4952

resolveAutoFallbackPrimaryProbe,

5053

resolveAgentDir,

54+

resolveDefaultAgentId,

5155

resolveEffectiveModelFallbacks,

5256

resolveSessionAgentId,

5357

resolveAgentSkillsFilter,

@@ -322,8 +326,11 @@ async function prepareAgentCommandExecution(opts: AgentCommandOpts, runtime: Run

322326

if (!message.trim()) {

323327

throw new Error("Message (--message) is required");

324328

}

325-

if (!opts.to && !opts.sessionId && !opts.sessionKey && !opts.agentId) {

326-

throw new Error("Pass --to <E.164>, --session-id, or --agent to choose a session");

329+

const rawExplicitSessionKey = opts.sessionKey?.trim();

330+

if (!opts.to && !opts.sessionId && !rawExplicitSessionKey && !opts.agentId) {

331+

throw new Error(

332+

"Pass --to <E.164>, --session-key, --session-id, or --agent to choose a session",

333+

);

327334

}

328335329336

const { cfg } = await resolveAgentRuntimeConfig(runtime, {

@@ -346,8 +353,28 @@ async function prepareAgentCommandExecution(opts: AgentCommandOpts, runtime: Run

346353

);

347354

}

348355

}

349-

if (agentIdOverride && opts.sessionKey) {

350-

const sessionAgentId = resolveAgentIdFromSessionKey(opts.sessionKey);

356+

const shouldScopeDefaultAgentKey =

357+

rawExplicitSessionKey &&

358+

!agentIdOverride &&

359+

classifySessionKeyShape(rawExplicitSessionKey) === "legacy_or_alias" &&

360+

!isUnscopedSessionKeySentinel(rawExplicitSessionKey);

361+

const explicitSessionKey = scopeLegacySessionKeyToAgent({

362+

agentId:

363+

agentIdOverride ?? (shouldScopeDefaultAgentKey ? resolveDefaultAgentId(cfg) : undefined),

364+

sessionKey: rawExplicitSessionKey,

365+

mainKey: cfg.session?.mainKey,

366+

});

367+

if (explicitSessionKey && classifySessionKeyShape(explicitSessionKey) === "malformed_agent") {

368+

throw new Error(

369+

`Invalid --session-key "${explicitSessionKey}". Agent-prefixed session keys must use agent:<agent-id>:<session-key>.`,

370+

);

371+

}

372+

if (

373+

agentIdOverride &&

374+

explicitSessionKey &&

375+

classifySessionKeyShape(explicitSessionKey) === "agent"

376+

) {

377+

const sessionAgentId = resolveAgentIdFromSessionKey(explicitSessionKey);

351378

if (sessionAgentId !== agentIdOverride) {

352379

throw new Error(

353380

`Agent id "${agentIdOverrideRaw}" does not match session key agent "${sessionAgentId}".`,

@@ -381,7 +408,7 @@ async function prepareAgentCommandExecution(opts: AgentCommandOpts, runtime: Run

381408

cfg,

382409

to: opts.to,

383410

sessionId: opts.sessionId,

384-

sessionKey: opts.sessionKey,

411+

sessionKey: explicitSessionKey,

385412

agentId: agentIdOverride,

386413

});

387414

@@ -398,7 +425,7 @@ async function prepareAgentCommandExecution(opts: AgentCommandOpts, runtime: Run

398425

const sessionAgentId =

399426

agentIdOverride ??

400427

resolveSessionAgentId({

401-

sessionKey: sessionKey ?? opts.sessionKey?.trim(),

428+

sessionKey: sessionKey ?? explicitSessionKey,

402429

config: cfg,

403430

});

404431

const outboundSession = buildOutboundSessionContext({