vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-12 17:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use target agent dir for directive persistence

Browse Source
This commit is contained in:
Tak Hoffman
2026-04-10 20:01:57 -05:00
parent dbe4cf24a5
commit aaec5c3283
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/auto-reply/reply/directive-handling.model.test.ts
View File

@@ -25,6 +25,7 @@ import {
clearRuntimeAuthProfileStoreSnapshots,
replaceRuntimeAuthProfileStoreSnapshots,
} from "../../agents/auth-profiles.js";
import { resolveAgentDir, resolveSessionAgentId } from "../../agents/agent-scope.js";
import type { ModelAliasIndex } from "../../agents/model-selection.js";
import type { OpenClawConfig } from "../../config/config.js";
import type { SessionEntry } from "../../config/sessions.js";
@@ -105,6 +106,8 @@ beforeEach(() => {
store: { version: 1, profiles: {} },
},
]);
vi.mocked(resolveAgentDir).mockReset().mockReturnValue(TEST_AGENT_DIR);
vi.mocked(resolveSessionAgentId).mockReset().mockReturnValue("main");
liveModelSwitchMocks.requestLiveSessionModelSwitch.mockReset().mockReturnValue(false);
queueMocks.refreshQueuedFollowupSession.mockReset();
});
@@ -475,6 +478,23 @@ describe("/model chat UX", () => {
expect(sessionEntry.authProfileOverride).toBe(OPENAI_DATE_PROFILE_ID);
});
it("resolves agentDir from the target session agent before wrapper agentDir", async () => {
vi.mocked(resolveSessionAgentId).mockReturnValue("target");
vi.mocked(resolveAgentDir).mockReturnValue("/tmp/target-agent");
await persistModelDirectiveForTest({
command: "/model openai/gpt-4o hello",
allowedModelKeys: ["openai/gpt-4o"],
sessionEntry: createSessionEntry(),
});
expect(resolveSessionAgentId).toHaveBeenCalledWith({
sessionKey: "agent:main:dm:1",
config: expect.any(Object),
});
expect(resolveAgentDir).toHaveBeenCalledWith(expect.any(Object), "target");
});
it("persists explicit auth profiles after @YYYYMMDD version suffixes in mixed-content messages", async () => {
const { sessionEntry } = await persistModelDirectiveForTest({
command: `/model custom/vertex-ai_claude-haiku-4-5@${OPENAI_DATE_PROFILE_ID}@work hello`,

2
src/auto-reply/reply/directive-handling.persist.ts
View File

@@ -76,7 +76,7 @@ export async function persistInlineDirectives(params: {
const activeAgentId = sessionKey
? resolveSessionAgentId({ sessionKey, config: cfg })
: resolveDefaultAgentId(cfg);
const agentDir = params.agentDir ?? resolveAgentDir(cfg, activeAgentId);
const agentDir = resolveAgentDir(cfg, activeAgentId) ?? params.agentDir;
if (sessionEntry && sessionStore && sessionKey) {
const prevElevatedLevel =