@syengup/friday-channel-next 0.1.12 → 0.1.13

package/dist/src/friday-session.js

@@ -1,6 +1,6 @@
 import { sseEmitter } from "./sse/emitter.js";
 import { getFridayAgentForwardRuntime } from "./agent-forward-runtime.js";
-import { toSessionStoreKey } from "./session/session-manager.js";
+import { toSessionStoreKey, agentIdFromSessionKey } from "./session/session-manager.js";
 import { getOpenClawAgentRunContext } from "./agent-run-context-bridge.js";
 import { observeAgentEventForActiveRuns } from "./agent/active-runs.js";
 import { getRunMetadata, ingestAgentEventMetadata } from "./run-metadata.js";
@@ -118,7 +118,6 @@ export function resolveHistorySessionKeyForFridayDevice(deviceId) {
         return fromMemory;
     return `agent:main:friday-next-${did}`;
 }
-const DEFAULT_SESSION_STORE_AGENT_ID = "main";
 function mergeRunMetadataIntoLifecycleEnd(runId, base) {
     const meta = getRunMetadata(runId);
     if (!meta)
@@ -151,9 +150,9 @@ function tryReadSessionUsageFromStore(sessionKeyForStore) {
     try {
         const cfg = access.getConfig();
         const storeConfig = cfg?.session?.store;
-        const storePath = access.resolveStorePath(storeConfig, { agentId: DEFAULT_SESSION_STORE_AGENT_ID });
-        const store = access.loadSessionStore(storePath, { skipCache: true });
         const canonical = toSessionStoreKey(sessionKeyForStore);
+        const storePath = access.resolveStorePath(storeConfig, { agentId: agentIdFromSessionKey(canonical) });
+        const store = access.loadSessionStore(storePath, { skipCache: true });
         const entry = store[canonical] ?? store[sessionKeyForStore.trim()];
         if (!entry || typeof entry !== "object")
             return undefined;

package/dist/src/http/handlers/messages.js

@@ -14,7 +14,7 @@ import { resolveFridayNextConfig } from "../../config.js";
 import { getHostOpenClawConfigSnapshot } from "../../host-config.js";
 import { getFridayNextRuntime } from "../../runtime.js";
 import { getFridayAgentForwardRuntime } from "../../agent-forward-runtime.js";
-import { setSessionSettings, splitModelRef, toSessionStoreKey } from "../../session/session-manager.js";
+import { agentIdFromSessionKey, setSessionSettings, splitModelRef, toSessionStoreKey, } from "../../session/session-manager.js";
 import { sseEmitter } from "../../sse/emitter.js";
 import { extractBearerToken } from "../middleware/auth.js";
 import { readJsonBody } from "../middleware/body.js";
@@ -315,6 +315,10 @@ export async function handleMessages(req, res) {
     log("MESSAGE_RECEIVED", normalizedDeviceId, runId, `textLen=${trimmedText.length} attachments=${attachments.length} sessionKey=${baseSessionKey}`);
     const cfg = resolveFridayNextConfig(getHostOpenClawConfigSnapshot(runtime.config));
     // Resolve defaults from the OpenClaw agent config so settings are never left empty.
+    // The target agent comes from the app-supplied sessionKey (`agent:<id>:<rest>`); prefer that
+    // agent's own configured model/thinking over the global defaults so non-main agents are not
+    // silently forced onto the global default model.
+    const targetAgentId = agentIdFromSessionKey(baseSessionKey);
     let defaultModel;
     let defaultThinking;
     try {
@@ -322,13 +326,24 @@ export async function handleMessages(req, res) {
         if (forwardRt) {
             const ocCfg = (forwardRt.getConfig() ?? {});
             const agents = ocCfg.agents;
+            const agentEntry = agents?.list?.find((a) => agentIdFromSessionKey(`agent:${String(a?.id ?? "")}:x`) === targetAgentId);
+            const agentModel = agentEntry?.model;
+            const perAgentModel = typeof agentModel === "string"
+                ? agentModel
+                : typeof agentModel?.primary === "string"
+                    ? agentModel.primary
+                    : undefined;
+            const perAgentThinking = typeof agentEntry?.thinkingDefault === "string"
+                ? agentEntry.thinkingDefault
+                : undefined;
             const agentDefaults = agents?.defaults;
             const model = agentDefaults?.model;
-            defaultModel = typeof model?.primary === "string" ? model.primary : undefined;
-            defaultThinking =
-                typeof agentDefaults?.thinkingDefault === "string"
-                    ? agentDefaults.thinkingDefault
-                    : undefined;
+            const globalModel = typeof model?.primary === "string" ? model.primary : undefined;
+            const globalThinking = typeof agentDefaults?.thinkingDefault === "string"
+                ? agentDefaults.thinkingDefault
+                : undefined;
+            defaultModel = perAgentModel ?? globalModel;
+            defaultThinking = perAgentThinking ?? globalThinking;
         }
     }
     catch {

package/dist/src/session/session-manager.d.ts

@@ -3,6 +3,12 @@ export declare function splitModelRef(modelRef: string): {
     modelId: string;
 };
 export declare function toSessionStoreKey(rawSessionKey: string): string;
+/**
+ * Extract the agent id from a (possibly raw) session key. The downstream app now owns the
+ * full `agent:<id>:<rest>` key, so non-`main` agents must read/write their own session store
+ * directory. `agent:<id>:<rest>` → `<id>`; bare/legacy keys (or an unsafe id) → `main`.
+ */
+export declare function agentIdFromSessionKey(rawSessionKey: string): string;
 export declare function ensureSessionLevels(sessionKey: string, reasoningLevel: string, thinkingLevel: string, historyDir?: string): void;
 export interface FridaySessionSettings {
     reasoningLevel?: string;

package/dist/src/session/session-manager.js

@@ -3,6 +3,8 @@ import os from "node:os";
 import { readFileSync, writeFileSync } from "node:fs";
 const FRIDAY_AGENT_ID = "main";
 const SESSION_ID_RE = /^[a-z0-9][a-z0-9._-]{0,127}$/i;
+/** Path/shell-safe agent id (mirrors OpenClaw's `normalizeAgentId`). Anything else falls back to `main`. */
+const SAFE_AGENT_ID_RE = /^[a-z0-9][a-z0-9_-]*$/;
 function deriveOpenClawBaseDir(historyDir) {
     if (historyDir) {
         const match = historyDir.replace(/[\\/]+$/, "").match(/(.*[\\/]\.openclaw)[\\/]/);
@@ -37,6 +39,16 @@ export function toSessionStoreKey(rawSessionKey) {
     }
     return `agent:${FRIDAY_AGENT_ID}:${lowered}`;
 }
+/**
+ * Extract the agent id from a (possibly raw) session key. The downstream app now owns the
+ * full `agent:<id>:<rest>` key, so non-`main` agents must read/write their own session store
+ * directory. `agent:<id>:<rest>` → `<id>`; bare/legacy keys (or an unsafe id) → `main`.
+ */
+export function agentIdFromSessionKey(rawSessionKey) {
+    const canonical = toSessionStoreKey(rawSessionKey);
+    const id = canonical.match(/^agent:([^:]+):/)?.[1];
+    return id && SAFE_AGENT_ID_RE.test(id) ? id : FRIDAY_AGENT_ID;
+}
 function toSafeSessionId(raw) {
     const s = raw.trim();
     if (SESSION_ID_RE.test(s))
@@ -54,8 +66,8 @@ function sessionIdForSessionsFile(fileKey, rawSessionKey) {
     for (const c of candidates) {
         if (SESSION_ID_RE.test(c))
             return c;
-        if (c.startsWith(`agent:${FRIDAY_AGENT_ID}:`)) {
-            const tail = c.slice(`agent:${FRIDAY_AGENT_ID}:`.length);
+        const tail = c.match(/^agent:[^:]+:(.+)$/)?.[1];
+        if (tail) {
             if (SESSION_ID_RE.test(tail))
                 return tail;
             return toSafeSessionId(tail);
@@ -63,9 +75,9 @@ function sessionIdForSessionsFile(fileKey, rawSessionKey) {
     }
     return toSafeSessionId(rawSessionKey || fileKey);
 }
-function resolveSessionsFilePath(historyDir) {
+function resolveSessionsFilePath(historyDir, agentId) {
     const base = deriveOpenClawBaseDir(historyDir);
-    return join(base, "agents/main/sessions/sessions.json");
+    return join(base, "agents", agentId, "sessions", "sessions.json");
 }
 function readSessionsData(path) {
     try {
@@ -98,11 +110,11 @@ export function ensureSessionLevels(sessionKey, reasoningLevel, thinkingLevel, h
 }
 export function setSessionSettings(sessionKey, settings, historyDir) {
     try {
-        const sessionsFile = resolveSessionsFilePath(historyDir);
+        const fileKey = toSessionStoreKey(sessionKey);
+        const sessionsFile = resolveSessionsFilePath(historyDir, agentIdFromSessionKey(fileKey));
         const data = readSessionsData(sessionsFile);
         if (!data)
             return {};
-        const fileKey = toSessionStoreKey(sessionKey);
         upsertSessionEntry(data, fileKey, sessionKey);
         const fieldKeys = [
             "reasoningLevel", "thinkingLevel", "modelRef", "providerOverride", "modelOverride",
@@ -137,11 +149,11 @@ function readSettingsFromEntry(entry) {
 }
 export function getSessionSettings(sessionKey, historyDir) {
     try {
-        const sessionsFile = resolveSessionsFilePath(historyDir);
+        const fileKey = toSessionStoreKey(sessionKey);
+        const sessionsFile = resolveSessionsFilePath(historyDir, agentIdFromSessionKey(fileKey));
         const data = readSessionsData(sessionsFile);
         if (!data)
             return {};
-        const fileKey = toSessionStoreKey(sessionKey);
         const entry = data[fileKey];
         if (!entry)
             return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syengup/friday-channel-next",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "OpenClaw Friday Next Apple channel plugin",
   "license": "MIT",
   "type": "module",

package/src/friday-session.ts

@@ -1,6 +1,6 @@
 import { sseEmitter } from "./sse/emitter.js";
 import { getFridayAgentForwardRuntime } from "./agent-forward-runtime.js";
-import { toSessionStoreKey } from "./session/session-manager.js";
+import { toSessionStoreKey, agentIdFromSessionKey } from "./session/session-manager.js";
 import { getOpenClawAgentRunContext } from "./agent-run-context-bridge.js";
 import { observeAgentEventForActiveRuns } from "./agent/active-runs.js";
 import { getRunMetadata, ingestAgentEventMetadata } from "./run-metadata.js";
@@ -138,8 +138,6 @@ export function resolveHistorySessionKeyForFridayDevice(deviceId: string): strin
   return `agent:main:friday-next-${did}`;
 }
 
-const DEFAULT_SESSION_STORE_AGENT_ID = "main";
-
 type ForwardAgentEventArgs = {
   runId: string;
   seq?: number;
@@ -186,9 +184,9 @@ function tryReadSessionUsageFromStore(sessionKeyForStore: string): FridaySession
   try {
     const cfg = access.getConfig() as { session?: { store?: string } } | null | undefined;
     const storeConfig = cfg?.session?.store;
-    const storePath = access.resolveStorePath(storeConfig, { agentId: DEFAULT_SESSION_STORE_AGENT_ID });
-    const store = access.loadSessionStore(storePath, { skipCache: true }) as Record<string, Record<string, unknown>>;
     const canonical = toSessionStoreKey(sessionKeyForStore);
+    const storePath = access.resolveStorePath(storeConfig, { agentId: agentIdFromSessionKey(canonical) });
+    const store = access.loadSessionStore(storePath, { skipCache: true }) as Record<string, Record<string, unknown>>;
     const entry = store[canonical] ?? store[sessionKeyForStore.trim()];
     if (!entry || typeof entry !== "object") return undefined;
     return buildSessionUsageSnapshot(entry);

package/src/http/handlers/messages.ts

@@ -28,7 +28,12 @@ import { resolveFridayNextConfig } from "../../config.js";
 import { getHostOpenClawConfigSnapshot } from "../../host-config.js";
 import { getFridayNextRuntime } from "../../runtime.js";
 import { getFridayAgentForwardRuntime } from "../../agent-forward-runtime.js";
-import { setSessionSettings, splitModelRef, toSessionStoreKey } from "../../session/session-manager.js";
+import {
+  agentIdFromSessionKey,
+  setSessionSettings,
+  splitModelRef,
+  toSessionStoreKey,
+} from "../../session/session-manager.js";
 import { sseEmitter } from "../../sse/emitter.js";
 import { extractBearerToken } from "../middleware/auth.js";
 import { readJsonBody } from "../middleware/body.js";
@@ -421,6 +426,10 @@ export async function handleMessages(req: IncomingMessage, res: ServerResponse):
   const cfg = resolveFridayNextConfig(getHostOpenClawConfigSnapshot(runtime.config));
 
   // Resolve defaults from the OpenClaw agent config so settings are never left empty.
+  // The target agent comes from the app-supplied sessionKey (`agent:<id>:<rest>`); prefer that
+  // agent's own configured model/thinking over the global defaults so non-main agents are not
+  // silently forced onto the global default model.
+  const targetAgentId = agentIdFromSessionKey(baseSessionKey);
   let defaultModel: string | undefined;
   let defaultThinking: string | undefined;
   try {
@@ -428,13 +437,32 @@ export async function handleMessages(req: IncomingMessage, res: ServerResponse):
     if (forwardRt) {
       const ocCfg = (forwardRt.getConfig() ?? {}) as Record<string, unknown>;
       const agents = ocCfg.agents as Record<string, unknown> | undefined;
+
+      const agentEntry = (agents?.list as Array<Record<string, unknown>> | undefined)?.find(
+        (a) => agentIdFromSessionKey(`agent:${String(a?.id ?? "")}:x`) === targetAgentId,
+      );
+      const agentModel = agentEntry?.model;
+      const perAgentModel =
+        typeof agentModel === "string"
+          ? agentModel
+          : typeof (agentModel as Record<string, unknown> | undefined)?.primary === "string"
+            ? ((agentModel as Record<string, unknown>).primary as string)
+            : undefined;
+      const perAgentThinking =
+        typeof agentEntry?.thinkingDefault === "string"
+          ? (agentEntry.thinkingDefault as string)
+          : undefined;
+
       const agentDefaults = agents?.defaults as Record<string, unknown> | undefined;
       const model = agentDefaults?.model as Record<string, unknown> | undefined;
-      defaultModel = typeof model?.primary === "string" ? (model.primary as string) : undefined;
-      defaultThinking =
+      const globalModel = typeof model?.primary === "string" ? (model.primary as string) : undefined;
+      const globalThinking =
         typeof agentDefaults?.thinkingDefault === "string"
           ? (agentDefaults.thinkingDefault as string)
           : undefined;
+
+      defaultModel = perAgentModel ?? globalModel;
+      defaultThinking = perAgentThinking ?? globalThinking;
     }
   } catch {
     // Config not available (tests) — leave defaults undefined.

package/src/session/session-manager.test.ts

@@ -0,0 +1,90 @@
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, rmSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import {
+  agentIdFromSessionKey,
+  toSessionStoreKey,
+  setSessionSettings,
+  getSessionSettings,
+} from "./session-manager.js";
+
+describe("agentIdFromSessionKey", () => {
+  it("extracts the agent id from a fully-qualified key", () => {
+    expect(agentIdFromSessionKey("agent:operator:friday:direct:abc:1")).toBe("operator");
+    expect(agentIdFromSessionKey("agent:ha-maestro:main")).toBe("ha-maestro");
+  });
+
+  it("falls back to main for bare / legacy keys", () => {
+    expect(agentIdFromSessionKey("main")).toBe("main");
+    expect(agentIdFromSessionKey("friday:direct:dev:1")).toBe("main");
+    expect(agentIdFromSessionKey("")).toBe("main");
+  });
+
+  it("rejects path-unsafe agent ids (no traversal)", () => {
+    expect(agentIdFromSessionKey("agent:../../etc:foo")).toBe("main");
+  });
+});
+
+describe("per-agent session settings file routing", () => {
+  let baseDir: string;
+  let historyDir: string;
+
+  // historyDir must contain a `.openclaw` segment so deriveOpenClawBaseDir resolves the base.
+  function seedSessionsFile(agentId: string): string {
+    const dir = join(baseDir, ".openclaw", "agents", agentId, "sessions");
+    mkdirSync(dir, { recursive: true });
+    const file = join(dir, "sessions.json");
+    writeFileSync(file, JSON.stringify({}), "utf-8");
+    return file;
+  }
+
+  function readEntry(agentId: string, fileKey: string): Record<string, unknown> | undefined {
+    const file = join(baseDir, ".openclaw", "agents", agentId, "sessions", "sessions.json");
+    const data = JSON.parse(readFileSync(file, "utf-8")) as Record<string, Record<string, unknown>>;
+    return data[fileKey];
+  }
+
+  beforeEach(() => {
+    baseDir = mkdtempSync(join(tmpdir(), "friday-sm-"));
+    historyDir = join(baseDir, ".openclaw", "friday-next", "history");
+  });
+
+  afterEach(() => {
+    rmSync(baseDir, { recursive: true, force: true });
+  });
+
+  it("writes settings for a non-main agent into agents/<agentId>/sessions", () => {
+    seedSessionsFile("operator");
+    const sessionKey = "agent:operator:friday:direct:dev:1";
+
+    setSessionSettings(sessionKey, { reasoningLevel: "stream", thinkingLevel: "high" }, historyDir);
+
+    const entry = readEntry("operator", toSessionStoreKey(sessionKey));
+    expect(entry?.reasoningLevel).toBe("stream");
+    expect(entry?.thinkingLevel).toBe("high");
+
+    // Round-trips through getSessionSettings from the same per-agent file.
+    const read = getSessionSettings(sessionKey, historyDir);
+    expect(read.reasoningLevel).toBe("stream");
+    expect(read.thinkingLevel).toBe("high");
+  });
+
+  it("does not leak a non-main agent's settings into the main store", () => {
+    seedSessionsFile("operator");
+    seedSessionsFile("main");
+
+    setSessionSettings("agent:operator:s1", { modelRef: "openai/gpt-x" }, historyDir);
+
+    expect(readEntry("operator", "agent:operator:s1")?.modelRef).toBe("openai/gpt-x");
+    expect(getSessionSettings("main", historyDir).modelRef).toBeUndefined();
+  });
+
+  it("still routes bare/main keys to agents/main", () => {
+    seedSessionsFile("main");
+
+    setSessionSettings("main", { thinkingLevel: "low" }, historyDir);
+
+    expect(readEntry("main", "agent:main:main")?.thinkingLevel).toBe("low");
+  });
+});

package/src/session/session-manager.ts

@@ -4,6 +4,8 @@ import { readFileSync, writeFileSync } from "node:fs";
 
 const FRIDAY_AGENT_ID = "main";
 const SESSION_ID_RE = /^[a-z0-9][a-z0-9._-]{0,127}$/i;
+/** Path/shell-safe agent id (mirrors OpenClaw's `normalizeAgentId`). Anything else falls back to `main`. */
+const SAFE_AGENT_ID_RE = /^[a-z0-9][a-z0-9_-]*$/;
 
 function deriveOpenClawBaseDir(historyDir?: string): string {
   if (historyDir) {
@@ -41,6 +43,17 @@ export function toSessionStoreKey(rawSessionKey: string): string {
   return `agent:${FRIDAY_AGENT_ID}:${lowered}`;
 }
 
+/**
+ * Extract the agent id from a (possibly raw) session key. The downstream app now owns the
+ * full `agent:<id>:<rest>` key, so non-`main` agents must read/write their own session store
+ * directory. `agent:<id>:<rest>` → `<id>`; bare/legacy keys (or an unsafe id) → `main`.
+ */
+export function agentIdFromSessionKey(rawSessionKey: string): string {
+  const canonical = toSessionStoreKey(rawSessionKey);
+  const id = canonical.match(/^agent:([^:]+):/)?.[1];
+  return id && SAFE_AGENT_ID_RE.test(id) ? id : FRIDAY_AGENT_ID;
+}
+
 function toSafeSessionId(raw: string): string {
   const s = raw.trim();
   if (SESSION_ID_RE.test(s)) return s;
@@ -57,8 +70,8 @@ function sessionIdForSessionsFile(fileKey: string, rawSessionKey: string): strin
   const candidates = [rawSessionKey.trim(), fileKey.trim()];
   for (const c of candidates) {
     if (SESSION_ID_RE.test(c)) return c;
-    if (c.startsWith(`agent:${FRIDAY_AGENT_ID}:`)) {
-      const tail = c.slice(`agent:${FRIDAY_AGENT_ID}:`.length);
+    const tail = c.match(/^agent:[^:]+:(.+)$/)?.[1];
+    if (tail) {
       if (SESSION_ID_RE.test(tail)) return tail;
       return toSafeSessionId(tail);
     }
@@ -66,9 +79,9 @@ function sessionIdForSessionsFile(fileKey: string, rawSessionKey: string): strin
   return toSafeSessionId(rawSessionKey || fileKey);
 }
 
-function resolveSessionsFilePath(historyDir?: string): string {
+function resolveSessionsFilePath(historyDir: string | undefined, agentId: string): string {
   const base = deriveOpenClawBaseDir(historyDir);
-  return join(base, "agents/main/sessions/sessions.json");
+  return join(base, "agents", agentId, "sessions", "sessions.json");
 }
 
 function readSessionsData(path: string): Record<string, Record<string, unknown>> | null {
@@ -125,11 +138,11 @@ export function setSessionSettings(
   historyDir?: string,
 ): FridaySessionSettings {
   try {
-    const sessionsFile = resolveSessionsFilePath(historyDir);
+    const fileKey = toSessionStoreKey(sessionKey);
+    const sessionsFile = resolveSessionsFilePath(historyDir, agentIdFromSessionKey(fileKey));
     const data = readSessionsData(sessionsFile);
     if (!data) return {};
 
-    const fileKey = toSessionStoreKey(sessionKey);
     upsertSessionEntry(data, fileKey, sessionKey);
 
     const fieldKeys: (keyof FridaySessionSettings)[] = [
@@ -172,11 +185,11 @@ export function getSessionSettings(
   historyDir?: string,
 ): FridaySessionSettings {
   try {
-    const sessionsFile = resolveSessionsFilePath(historyDir);
+    const fileKey = toSessionStoreKey(sessionKey);
+    const sessionsFile = resolveSessionsFilePath(historyDir, agentIdFromSessionKey(fileKey));
     const data = readSessionsData(sessionsFile);
     if (!data) return {};
 
-    const fileKey = toSessionStoreKey(sessionKey);
     const entry = data[fileKey];
     if (!entry) return {};
     return readSettingsFromEntry(entry);