@syengup/friday-channel-next 0.1.36 → 0.1.38

package/dist/src/http/handlers/nodes-approve.js

@@ -58,12 +58,7 @@ export async function handleNodesApprove(req, res) {
     if (pendingMatch) {
         const requestId = pendingMatch.requestId;
         log.info(`approving nodeId=${normalizedNodeId} requestId=${requestId}`);
-        const callerScopes = [
-            "operator.admin",
-            "operator.pairing",
-            "operator.read",
-            "operator.write",
-        ];
+        const callerScopes = ["operator.admin", "operator.pairing", "operator.read", "operator.write"];
         let approved;
         try {
             approved = await approveNodePairing(requestId, { callerScopes });

package/dist/src/http/handlers/plugin-info.js

@@ -1,6 +1,6 @@
 import { extractBearerToken } from "../middleware/auth.js";
 import { PLUGIN_VERSION } from "../../version.js";
-import { fetchLatestVersion, getInstallSource, semverGreater, } from "../../plugin-install-info.js";
+import { fetchLatestVersion, getInstallSource, semverGreater } from "../../plugin-install-info.js";
 export async function handlePluginInfo(req, res) {
     if (req.method !== "GET") {
         res.statusCode = 405;

package/dist/src/http/server.js

@@ -65,7 +65,8 @@ async function handleFridayNextRoute(req, res) {
     if (req.method === "POST" && pathname === "/friday-next/nodes-approve") {
         return await handleNodesApprove(req, res);
     }
-    if ((req.method === "PUT" || req.method === "GET") && pathname === "/friday-next/sessions/settings") {
+    if ((req.method === "PUT" || req.method === "GET") &&
+        pathname === "/friday-next/sessions/settings") {
         return await handleSessionsSettings(req, res);
     }
     if (req.method === "GET" && pathname === "/friday-next/models") {
@@ -106,7 +107,8 @@ async function handleFridayNextRoute(req, res) {
         return await handleHistoryMessages(req, res);
     }
     // Route: PUT /friday-next/sessions/title (sync app session name → server displayName)
-    if ((req.method === "PUT" || req.method === "POST") && pathname === "/friday-next/sessions/title") {
+    if ((req.method === "PUT" || req.method === "POST") &&
+        pathname === "/friday-next/sessions/title") {
         return await handleHistorySetTitle(req, res);
     }
     // Route: GET /friday-next/link-preview?url=... (Open Graph metadata for preview cards)

package/dist/src/link-preview/og-parse.js

@@ -78,7 +78,9 @@ export function parseOpenGraph(html, baseUrl) {
     let metaDescription = null;
     for (const match of slice.matchAll(META_TAG_RE)) {
         const tag = match[0];
-        const key = (attributeValue(tag, "property") ?? attributeValue(tag, "name"))?.trim().toLowerCase();
+        const key = (attributeValue(tag, "property") ?? attributeValue(tag, "name"))
+            ?.trim()
+            .toLowerCase();
         if (!key)
             continue;
         const content = attributeValue(tag, "content");

package/dist/src/plugin-install-info.js

@@ -87,7 +87,10 @@ export async function fetchLatestVersion(nowMs) {
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), 5000);
         try {
-            const res = await fetch(`https://registry.npmjs.org/${PLUGIN_PACKAGE_NAME}/latest`, { signal: controller.signal, headers: { Accept: "application/json" } });
+            const res = await fetch(`https://registry.npmjs.org/${PLUGIN_PACKAGE_NAME}/latest`, {
+                signal: controller.signal,
+                headers: { Accept: "application/json" },
+            });
             if (res.ok) {
                 const body = (await res.json());
                 if (typeof body.version === "string" && body.version)

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

@@ -118,7 +118,11 @@ export function setSessionSettings(sessionKey, settings, historyDir) {
             return {};
         upsertSessionEntry(data, fileKey, sessionKey);
         const fieldKeys = [
-            "reasoningLevel", "thinkingLevel", "modelRef", "providerOverride", "modelOverride",
+            "reasoningLevel",
+            "thinkingLevel",
+            "modelRef",
+            "providerOverride",
+            "modelOverride",
         ];
         let updated = false;
         for (const key of fieldKeys) {
@@ -193,7 +197,7 @@ export function resolveAgentDefaults(sessionKey) {
         const ocCfg = (forwardRt.getConfig() ?? {});
         const agents = ocCfg.agents;
         const targetAgentId = agentIdFromSessionKey(sessionKey);
-        const agentEntry = agents?.list?.find((a) => agentIdFromSessionKey(`agent:${String(a?.id ?? "")}:x`) === targetAgentId);
+        const agentEntry = agents?.list?.find((a) => agentIdFromSessionKey(`agent:${typeof a?.id === "string" ? a.id : typeof a?.id === "number" ? String(a.id) : ""}:x`) === targetAgentId);
         const agentModel = agentEntry?.model;
         const perAgentModel = typeof agentModel === "string"
             ? agentModel
@@ -204,7 +208,9 @@ export function resolveAgentDefaults(sessionKey) {
         const agentDefaults = agents?.defaults;
         const model = agentDefaults?.model;
         const globalModel = typeof model?.primary === "string" ? model.primary : undefined;
-        const globalThinking = typeof agentDefaults?.thinkingDefault === "string" ? agentDefaults.thinkingDefault : undefined;
+        const globalThinking = typeof agentDefaults?.thinkingDefault === "string"
+            ? agentDefaults.thinkingDefault
+            : undefined;
         return { model: perAgentModel ?? globalModel, thinking: perAgentThinking ?? globalThinking };
     }
     catch {

package/dist/src/session-usage-store.js

@@ -24,7 +24,9 @@ export function readSessionUsageSnapshotFromStore(sessionKeyForStore) {
         const cfg = access.getConfig();
         const storeConfig = cfg?.session?.store;
         const canonical = toSessionStoreKey(sessionKeyForStore);
-        const storePath = access.resolveStorePath(storeConfig, { agentId: agentIdFromSessionKey(canonical) });
+        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")

package/dist/src/skills-discovery.d.ts

@@ -12,7 +12,9 @@
  * marker core's `loadSkillsFromDir` uses).
  *
  * Each discovered skill is tagged with a `source` category for the UI:
- *  - workspace : the agent's own + the shared default-agent workspace `skills/`
+ *  - workspace : the TARGET agent's own workspace `skills/` only — mirroring ControlUI,
+ *                which scans the single workspace resolved for that agent and never folds
+ *                in another agent's workspace (main is just another agent, not a shared pool)
  *  - installed : managed skills dir (`<configDir>/skills`, sibling of the workspace)
  *  - built-in  : bundled core skills (`<openclaw>/skills`)
  *  - extra     : skills from ENABLED extensions (`<openclaw>/dist/extensions/<ext>/skills`,
@@ -49,9 +51,8 @@ export declare function resolveOpenClawRoot(): string | null;
 export declare function enabledExtensionNames(cfg: unknown): Set<string>;
 /**
  * Full set of skills `agentId` can load, sorted by id, each tagged with its source
- * category. Aggregates the agent's workspace, the shared root workspace, the managed
- * dir, config extra dirs, and bundled core/extension skills. Every source is optional
- * and failure-tolerant.
+ * category. Aggregates the TARGET agent's own workspace, the managed dir, config extra
+ * dirs, and bundled core/extension skills. Every source is optional and failure-tolerant.
  */
 export declare function discoverAvailableSkills(cfg: unknown, agentId: string): DiscoveredSkill[];
 /** Test-only: reset the cached openclaw root. */

package/dist/src/skills-discovery.js

@@ -12,7 +12,9 @@
  * marker core's `loadSkillsFromDir` uses).
  *
  * Each discovered skill is tagged with a `source` category for the UI:
- *  - workspace : the agent's own + the shared default-agent workspace `skills/`
+ *  - workspace : the TARGET agent's own workspace `skills/` only — mirroring ControlUI,
+ *                which scans the single workspace resolved for that agent and never folds
+ *                in another agent's workspace (main is just another agent, not a shared pool)
  *  - installed : managed skills dir (`<configDir>/skills`, sibling of the workspace)
  *  - built-in  : bundled core skills (`<openclaw>/skills`)
  *  - extra     : skills from ENABLED extensions (`<openclaw>/dist/extensions/<ext>/skills`,
@@ -200,34 +202,37 @@ function resolveDefaultAgentId(cfg) {
 }
 /**
  * Full set of skills `agentId` can load, sorted by id, each tagged with its source
- * category. Aggregates the agent's workspace, the shared root workspace, the managed
- * dir, config extra dirs, and bundled core/extension skills. Every source is optional
- * and failure-tolerant.
+ * category. Aggregates the TARGET agent's own workspace, the managed dir, config extra
+ * dirs, and bundled core/extension skills. Every source is optional and failure-tolerant.
  */
 export function discoverAvailableSkills(cfg, agentId) {
     const c = cfg;
     const resolveWs = getFridayAgentForwardRuntime()?.resolveAgentWorkspaceDir;
     const sources = [];
     if (resolveWs) {
-        const defaultId = resolveDefaultAgentId(c);
-        const ids = agentId === defaultId ? [agentId] : [agentId, defaultId];
-        let defaultWs;
-        for (const id of ids) {
-            try {
-                const ws = resolveWs(cfg, id);
-                if (ws) {
-                    sources.push({ dir: path.join(ws, "skills"), source: "workspace" });
-                    if (id === defaultId)
-                        defaultWs = ws;
-                }
-            }
-            catch {
-                // skip unresolvable workspace
-            }
+        // Workspace skills come ONLY from the target agent's own workspace — matching ControlUI's
+        // `resolveSkillsAgentWorkspace`→`buildWorkspaceSkillStatus(workspaceDir)`, which scans the
+        // single resolved workspace. Folding in the default agent's workspace (the old behavior)
+        // leaked main's skills into every other agent's catalog.
+        try {
+            const ws = resolveWs(cfg, agentId);
+            if (ws)
+                sources.push({ dir: path.join(ws, "skills"), source: "workspace" });
+        }
+        catch {
+            // skip unresolvable workspace
+        }
+        // Managed skills dir: `<configDir>/skills`. It is agent-independent; anchor it off the
+        // DEFAULT agent's workspace parent (the default workspace lives directly under configDir,
+        // whereas non-default workspaces may be nested under it).
+        try {
+            const defaultWs = resolveWs(cfg, resolveDefaultAgentId(c));
+            if (defaultWs)
+                sources.push({ dir: path.join(path.dirname(defaultWs), "skills"), source: "installed" });
+        }
+        catch {
+            // skip unresolvable managed dir
         }
-        // Managed skills dir: `<configDir>/skills`, the workspace's parent sibling.
-        if (defaultWs)
-            sources.push({ dir: path.join(path.dirname(defaultWs), "skills"), source: "installed" });
     }
     const extraDirs = c?.skills?.load?.extraDirs;
     if (Array.isArray(extraDirs)) {

package/dist/src/sse/offline-queue.js

@@ -116,7 +116,10 @@ export class FridaySseOfflineQueue {
                 continue;
             try {
                 const o = JSON.parse(line);
-                if (typeof o.id === "number" && typeof o.event === "string" && o.data && typeof o.data === "object") {
+                if (typeof o.id === "number" &&
+                    typeof o.event === "string" &&
+                    o.data &&
+                    typeof o.data === "object") {
                     all.push(o);
                 }
             }

package/dist/src/tool-catalog.js

@@ -108,8 +108,7 @@ function readStringArray(value) {
 }
 /** Read an agent's `tools` config block from the host config. */
 function findAgentTools(cfg, agentId) {
-    const list = cfg?.agents
-        ?.list;
+    const list = cfg?.agents?.list;
     if (!Array.isArray(list))
         return undefined;
     const entry = list.find((a) => a && typeof a === "object" && normalizeAgentId(a.id) === agentId);
@@ -154,7 +153,7 @@ export async function buildAgentToolsCatalog(cfg, agentId) {
         }
     }
     const tools = findAgentTools(cfg, agentId);
-    const profile = (typeof tools?.profile === "string" && tools.profile.trim()) ? tools.profile.trim() : null;
+    const profile = typeof tools?.profile === "string" && tools.profile.trim() ? tools.profile.trim() : null;
     const allow = new Set(readStringArray(tools?.allow));
     const alsoAllow = new Set(readStringArray(tools?.alsoAllow));
     const deny = new Set(readStringArray(tools?.deny));

package/dist/src/upgrade-runtime.d.ts

@@ -30,7 +30,7 @@ export type UpgradeRuntime = {
     /** Mutate the config file; `afterWrite: { mode: "restart" }` triggers a safe gateway restart. */
     mutateConfigFile: (params: {
         afterWrite: ConfigAfterWrite;
-        mutate: (draft: unknown) => unknown | void;
+        mutate: (draft: unknown) => unknown;
     }) => Promise<unknown>;
     /**
      * Filesystem path of THIS loaded plugin (`api.source`). Used to infer the install

package/dist/src/version.js

@@ -20,7 +20,9 @@ function resolvePluginVersion() {
             const path = fileURLToPath(new URL(rel, import.meta.url));
             const raw = readFileSync(path, "utf8");
             const pkg = JSON.parse(raw);
-            if (pkg.name === "@syengup/friday-channel-next" && typeof pkg.version === "string" && pkg.version) {
+            if (pkg.name === "@syengup/friday-channel-next" &&
+                typeof pkg.version === "string" &&
+                pkg.version) {
                 return pkg.version;
             }
         }

package/index.ts

@@ -1,7 +1,10 @@
-import type { ChannelPlugin } from "openclaw/plugin-sdk/core";
 import { defineChannelPluginEntry } from "openclaw/plugin-sdk/core";
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk/plugin-entry";
-import type { PluginHookBeforeToolCallEvent, PluginHookAfterToolCallEvent, PluginHookToolContext } from "openclaw/plugin-sdk/plugins/types";
+import type {
+  PluginHookBeforeToolCallEvent,
+  PluginHookAfterToolCallEvent,
+  PluginHookToolContext,
+} from "openclaw/plugin-sdk/plugins/types";
 import { fridayNextChannelPlugin } from "./src/channel.js";
 import { setFridayNextRuntime } from "./src/runtime.js";
 import { resolveFridayNextConfig } from "./src/config.js";
@@ -44,7 +47,7 @@ function deviceIdFromToolContext(ctx: PluginHookToolContext): string | null {
   const sk =
     typeof ctx.sessionKey === "string" && ctx.sessionKey.trim()
       ? ctx.sessionKey.trim()
-      : (ctx.runId ? getOpenClawAgentRunContext(ctx.runId)?.sessionKey?.trim() : undefined) ?? "";
+      : ((ctx.runId ? getOpenClawAgentRunContext(ctx.runId)?.sessionKey?.trim() : undefined) ?? "");
   if (sk) {
     const d = resolveFridayDeviceIdForSessionKey(sk);
     if (d) return d;
@@ -83,7 +86,7 @@ export default defineChannelPluginEntry({
   id: "friday-next",
   name: "Friday Next",
   description: "Friday Next Apple 应用通道",
-  plugin: fridayNextChannelPlugin as ChannelPlugin,
+  plugin: fridayNextChannelPlugin,
   setRuntime: setFridayNextRuntime,
   registerFull: (api: OpenClawPluginApi) => {
     setFridayAgentForwardRuntime(api);
@@ -93,7 +96,9 @@ export default defineChannelPluginEntry({
       lastApiRoutesRegistered = new WeakRef(api);
       registerFridayNextHttpRoutes(api);
     } else {
-      const cfg = resolveFridayNextConfig(getHostOpenClawConfigSnapshot(getFridayNextRuntime().config));
+      const cfg = resolveFridayNextConfig(
+        getHostOpenClawConfigSnapshot(getFridayNextRuntime().config),
+      );
       sseEmitter.setBacklogLimit(cfg.sseBacklogPerDevice);
     }
 
@@ -147,36 +152,39 @@ export default defineChannelPluginEntry({
       };
     });
 
-    api.on("before_tool_call", (event: PluginHookBeforeToolCallEvent, ctx: PluginHookToolContext) => {
-      if (!shouldForwardToolEventToFriday(ctx)) return;
-      const deviceId = deviceIdFromToolContext(ctx);
-      const runId = ctx.runId ?? "(unknown)";
-
-      const logLine = (detail: string) => {
-        hookLogger.debug(
-          `[TOOL_CALL] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`,
-        );
-      };
-
-      if (!deviceId) {
-        logLine("SKIP_no_deviceId");
-        return;
-      }
-
-      logLine("START");
-      sseEmitter.broadcastToolEvent(deviceId.toUpperCase(), runId, {
-        type: "tool-hook",
-        data: {
-          when: "before",
-          runId,
-          deviceId: deviceId.toUpperCase(),
-          sessionKey: ctx.sessionKey,
-          toolName: event.toolName,
-          params: event.params,
-          ts: Date.now(),
-        },
-      });
-    });
+    api.on(
+      "before_tool_call",
+      (event: PluginHookBeforeToolCallEvent, ctx: PluginHookToolContext) => {
+        if (!shouldForwardToolEventToFriday(ctx)) return;
+        const deviceId = deviceIdFromToolContext(ctx);
+        const runId = ctx.runId ?? "(unknown)";
+
+        const logLine = (detail: string) => {
+          hookLogger.debug(
+            `[TOOL_CALL] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`,
+          );
+        };
+
+        if (!deviceId) {
+          logLine("SKIP_no_deviceId");
+          return;
+        }
+
+        logLine("START");
+        sseEmitter.broadcastToolEvent(deviceId.toUpperCase(), runId, {
+          type: "tool-hook",
+          data: {
+            when: "before",
+            runId,
+            deviceId: deviceId.toUpperCase(),
+            sessionKey: ctx.sessionKey,
+            toolName: event.toolName,
+            params: event.params,
+            ts: Date.now(),
+          },
+        });
+      },
+    );
 
     api.on("after_tool_call", (event: PluginHookAfterToolCallEvent, ctx: PluginHookToolContext) => {
       if (!shouldForwardToolEventToFriday(ctx)) return;