github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-11 00:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Agent: resolve resumed session agent scope before run

Browse Source
This commit is contained in:
Vignesh Natarajan
2026-02-22 22:37:54 -08:00
parent 7fab4d128a
commit 5ad5ea53cd
3 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/commands/agent.ts
View File

@@ -3,6 +3,7 @@ import {
resolveAgentDir,
resolveEffectiveModelFallbacks,
resolveAgentModelPrimary,
resolveSessionAgentId,
resolveAgentSkillsFilter,
resolveAgentWorkspaceDir,
} from "../agents/agent-scope.js";
@@ -218,14 +219,6 @@ export async function agentCommand(
}
}
const agentCfg = cfg.agents?.defaults;
const sessionAgentId = agentIdOverride ?? resolveAgentIdFromSessionKey(opts.sessionKey?.trim());
const workspaceDirRaw = resolveAgentWorkspaceDir(cfg, sessionAgentId);
const agentDir = resolveAgentDir(cfg, sessionAgentId);
const workspace = await ensureAgentWorkspace({
dir: workspaceDirRaw,
ensureBootstrapFiles: !agentCfg?.skipBootstrap,
});
const workspaceDir = workspace.dir;
const configuredModel = resolveConfiguredModelRef({
cfg,
defaultProvider: DEFAULT_PROVIDER,
@@ -284,6 +277,19 @@ export async function agentCommand(
persistedThinking,
persistedVerbose,
} = sessionResolution;
const sessionAgentId =
agentIdOverride ??
resolveSessionAgentId({
sessionKey: sessionKey ?? opts.sessionKey?.trim(),
config: cfg,
});
const workspaceDirRaw = resolveAgentWorkspaceDir(cfg, sessionAgentId);
const agentDir = resolveAgentDir(cfg, sessionAgentId);
const workspace = await ensureAgentWorkspace({
dir: workspaceDirRaw,
ensureBootstrapFiles: !agentCfg?.skipBootstrap,
});
const workspaceDir = workspace.dir;
let sessionEntry = resolvedSessionEntry;
const runId = opts.runId?.trim() || sessionId;