@syengup/friday-channel-next 0.1.36 → 0.1.38

package/src/skills-discovery.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`,
@@ -80,7 +82,12 @@ function parseSkillFrontmatter(content: string): { name?: string; description?:
  * not descended into further; other directories are recursed up to a bounded depth.
  * First occurrence of an id wins (call higher-priority sources first). Best-effort.
  */
-function collectSkills(root: string, source: SkillSource, out: Map<string, DiscoveredSkill>, depth = 0): void {
+function collectSkills(
+  root: string,
+  source: SkillSource,
+  out: Map<string, DiscoveredSkill>,
+  depth = 0,
+): void {
   if (depth > MAX_SKILL_WALK_DEPTH) return;
   let entries: fs.Dirent[];
   try {
@@ -149,14 +156,17 @@ function computeOpenClawRoot(): string | null {
  * enabled extensions, so we gate on the same set (extension dir name == plugin id).
  */
 export function enabledExtensionNames(cfg: unknown): Set<string> {
-  const plugins = (cfg as Record<string, unknown> | undefined)?.plugins as Record<string, unknown> | undefined;
+  const plugins = (cfg as Record<string, unknown> | undefined)?.plugins as
+    | Record<string, unknown>
+    | undefined;
   const names = new Set<string>();
   const allow = plugins?.allow;
   if (Array.isArray(allow)) for (const n of allow) if (typeof n === "string") names.add(n);
   const entries = plugins?.entries as Record<string, unknown> | undefined;
   if (entries && typeof entries === "object") {
     for (const [name, val] of Object.entries(entries)) {
-      if (val && typeof val === "object" && (val as Record<string, unknown>).enabled === true) names.add(name);
+      if (val && typeof val === "object" && (val as Record<string, unknown>).enabled === true)
+        names.add(name);
     }
   }
   return names;
@@ -168,7 +178,9 @@ export function enabledExtensionNames(cfg: unknown): Set<string> {
  * → "extra" (core tags these `source: "extension"`). Extension skills are included
  * only when the extension is enabled, matching ControlUI's EXTRA bucket.
  */
-function bundledSkillSources(enabledExtensions: Set<string>): Array<{ dir: string; source: SkillSource }> {
+function bundledSkillSources(
+  enabledExtensions: Set<string>,
+): Array<{ dir: string; source: SkillSource }> {
   const root = resolveOpenClawRoot();
   if (!root) return [];
   const out: Array<{ dir: string; source: SkillSource }> = [
@@ -200,9 +212,8 @@ function resolveDefaultAgentId(cfg: Record<string, unknown> | undefined): 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 function discoverAvailableSkills(cfg: unknown, agentId: string): DiscoveredSkill[] {
   const c = cfg as Record<string, unknown> | undefined;
@@ -210,29 +221,34 @@ export function discoverAvailableSkills(cfg: unknown, agentId: string): Discover
   const sources: Array<{ dir: string; source: SkillSource }> = [];
 
   if (resolveWs) {
-    const defaultId = resolveDefaultAgentId(c);
-    const ids = agentId === defaultId ? [agentId] : [agentId, defaultId];
-    let defaultWs: string | undefined;
-    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 as Record<string, unknown> | undefined)?.load as
-    | Record<string, unknown>
-    | undefined)?.extraDirs;
+  const extraDirs = (
+    (c?.skills as Record<string, unknown> | undefined)?.load as Record<string, unknown> | undefined
+  )?.extraDirs;
   if (Array.isArray(extraDirs)) {
-    for (const d of extraDirs) if (typeof d === "string" && d.trim()) sources.push({ dir: d.trim(), source: "extra" });
+    for (const d of extraDirs)
+      if (typeof d === "string" && d.trim()) sources.push({ dir: d.trim(), source: "extra" });
   }
 
   sources.push(...bundledSkillSources(enabledExtensionNames(c)));

package/src/sse/emitter.test.ts

@@ -78,7 +78,7 @@ describe("sseEmitter", () => {
     const body = c.writes.join("");
     expect(body).toContain("id: 2");
     expect(body).toContain("id: 3");
-    expect(body).not.toContain("text\":\"a\"");
+    expect(body).not.toContain('text":"a"');
 
     sseEmitter.removeConnection("device-replay");
   });

package/src/sse/emitter.ts

@@ -4,7 +4,14 @@ import { fridaySseOfflineQueue } from "./offline-queue.js";
 
 const logger = createFridayNextLogger("sse", "info");
 
-export type SseEventType = "connected" | "agent" | "deliver" | "tool-hook" | "outbound" | "ping" | "subagent";
+export type SseEventType =
+  | "connected"
+  | "agent"
+  | "deliver"
+  | "tool-hook"
+  | "outbound"
+  | "ping"
+  | "subagent";
 
 export interface SseEvent {
   type: SseEventType;
@@ -36,8 +43,7 @@ export class SseConnection {
 
   send(entry: BacklogEntry | SseEvent, flushNow?: boolean): void {
     if (this.closed) return;
-    const normalized =
-      "id" in entry && "event" in entry ? entry : { id: Date.now(), event: entry as SseEvent };
+    const normalized = "id" in entry && "event" in entry ? entry : { id: Date.now(), event: entry };
     const payload = JSON.stringify(normalized.event.data);
     this.pending.push(
       `id: ${normalized.id}\nevent: ${normalized.event.type}\ndata: ${payload}\n\n`,

package/src/sse/offline-queue.ts

@@ -21,7 +21,9 @@ export function setOfflineQueueBaseDirForTest(dir: string | null): void {
 export function resolveFridayNextEventsQueueDir(): string {
   if (testQueueBaseDir) return testQueueBaseDir;
   try {
-    const cfg = resolveFridayNextConfig(getHostOpenClawConfigSnapshot(getFridayNextRuntime().config));
+    const cfg = resolveFridayNextConfig(
+      getHostOpenClawConfigSnapshot(getFridayNextRuntime().config),
+    );
     return path.join(path.dirname(cfg.historyDir), "events-queue");
   } catch {
     return path.join(os.homedir(), ".openclaw", "friday-next", "events-queue");
@@ -71,7 +73,13 @@ export class FridaySseOfflineQueue {
     return this.scanMaxId(deviceId.trim().toUpperCase());
   }
 
-  append(deviceId: string, id: number, event: string, data: Record<string, unknown>, backlogLimit: number): void {
+  append(
+    deviceId: string,
+    id: number,
+    event: string,
+    data: Record<string, unknown>,
+    backlogLimit: number,
+  ): void {
     if (event === "connected") return;
     this.ensureDir();
     const file = this.devicePath(deviceId);
@@ -119,7 +127,12 @@ export class FridaySseOfflineQueue {
       if (!line.trim()) continue;
       try {
         const o = JSON.parse(line) as PersistedSseEntry;
-        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);
         }
       } catch {
@@ -128,11 +141,7 @@ export class FridaySseOfflineQueue {
     }
     if (all.length <= keep) return;
     const slice = all.slice(-keep);
-    fs.writeFileSync(
-      file,
-      slice.map((e) => JSON.stringify(e) + "\n").join(""),
-      "utf8",
-    );
+    fs.writeFileSync(file, slice.map((e) => JSON.stringify(e) + "\n").join(""), "utf8");
   }
 }
 

package/src/test-support/app-simulator.ts

@@ -68,7 +68,9 @@ class MockRes extends Writable {
 }
 
 function createRouteHarness() {
-  let routeHandler: ((req: Readable & { method?: string; url?: string }, res: Writable) => Promise<boolean>) | null = null;
+  let routeHandler:
+    | ((req: Readable & { method?: string; url?: string }, res: Writable) => Promise<boolean>)
+    | null = null;
   const fakeApi = {
     logger: { info: () => {}, warn: () => {}, error: () => {}, debug: () => {} },
     registerHttpRoute(route: { handler: (req: never, res: never) => Promise<boolean> }) {
@@ -193,7 +195,14 @@ export function createAppSimulator(opts?: { deviceId?: string; token?: string })
       });
       return { status: res.statusCode, body: jsonBody(res) };
     },
-    async uploadFiles(parts: Array<{ name: string; filename: string; contentType: string; content: string | Buffer }>) {
+    async uploadFiles(
+      parts: Array<{
+        name: string;
+        filename: string;
+        contentType: string;
+        content: string | Buffer;
+      }>,
+    ) {
       const boundary = "----friday-next-e2e-boundary";
       const chunks: Buffer[] = [];
       for (const part of parts) {
@@ -235,7 +244,12 @@ export function createAppSimulator(opts?: { deviceId?: string; token?: string })
       const res = await request({ method: "OPTIONS", path, headers: { origin } });
       return { status: res.statusCode, headers: res.headers };
     },
-    async rawRequest(arg: { method: string; path: string; headers?: Headers; body?: string | Buffer }) {
+    async rawRequest(arg: {
+      method: string;
+      path: string;
+      headers?: Headers;
+      body?: string | Buffer;
+    }) {
       const res = await request(arg);
       return { status: res.statusCode, body: res.body.toString("utf-8"), headers: res.headers };
     },

package/src/test-support/mock-dispatch.ts

@@ -1,7 +1,12 @@
-import { __setMockFridayDispatchForTests, __resetMockFridayDispatchForTests } from "../agent/dispatch-bridge.js";
+import {
+  __setMockFridayDispatchForTests,
+  __resetMockFridayDispatchForTests,
+} from "../agent/dispatch-bridge.js";
 import { forwardAgentEventRaw } from "../friday-session.js";
 
-type DispatchArg = Parameters<typeof __setMockFridayDispatchForTests>[0] extends (arg: infer A) => unknown
+type DispatchArg = Parameters<typeof __setMockFridayDispatchForTests>[0] extends (
+  arg: infer A,
+) => unknown
   ? A
   : never;
 
@@ -133,12 +138,20 @@ export class MockDispatchScript {
 
   block(text: string, mediaUrls: string[] = [], audioAsVoice = false): this {
     this.steps.push(async (_args, callbacks) => {
-      await callbacks.deliver?.({ text, mediaUrls, audioAsVoice } as never, { kind: "block" } as never);
+      await callbacks.deliver?.(
+        { text, mediaUrls, audioAsVoice } as never,
+        { kind: "block" } as never,
+      );
     });
     return this;
   }
 
-  deliverFinal(payload: { text: string; mediaUrls?: string[]; audioAsVoice?: boolean; isError?: boolean }): this {
+  deliverFinal(payload: {
+    text: string;
+    mediaUrls?: string[];
+    audioAsVoice?: boolean;
+    isError?: boolean;
+  }): this {
     this.steps.push(async (_args, callbacks) => {
       await callbacks.deliver?.(payload as never, { kind: "final" } as never);
     });

package/src/thinking-levels.ts

@@ -53,7 +53,9 @@ export function resolveModelThinking(
 }
 
 /** Resolves thinking levels for a full `provider/model` ref (or bare model id). */
-export function resolveModelThinkingForRef(modelRef: string | undefined | null): ResolvedModelThinking {
+export function resolveModelThinkingForRef(
+  modelRef: string | undefined | null,
+): ResolvedModelThinking {
   if (!modelRef) return { levels: BASE_THINKING_LEVELS };
   const split = splitModelRef(modelRef);
   return resolveModelThinking(split.provider, split.modelId);

package/src/tool-catalog.ts

@@ -15,7 +15,6 @@
 
 import fs from "node:fs";
 import path from "node:path";
-import { getFridayAgentForwardRuntime } from "./agent-forward-runtime.js";
 import { resolveOpenClawRoot } from "./skills-discovery.js";
 import { normalizeAgentId } from "./agent-id.js";
 
@@ -38,7 +37,11 @@ interface CoreCatalogResult {
   profiles: Array<{ id: string; label: string }>;
   groups: CoreCatalogGroup[];
 }
-type BuildFn = (params: { cfg: unknown; agentId?: string; includePlugins?: boolean }) => CoreCatalogResult;
+type BuildFn = (params: {
+  cfg: unknown;
+  agentId?: string;
+  includePlugins?: boolean;
+}) => CoreCatalogResult;
 
 let cachedBuildFn: BuildFn | null | undefined;
 
@@ -127,7 +130,8 @@ async function locateBuildFn(): Promise<BuildFn | null> {
     if (!content.includes("function buildToolsCatalogResult")) continue;
     try {
       const mod = (await import(path.join(distDir, file))) as Record<string, unknown>;
-      if (typeof mod.buildToolsCatalogResult === "function") return mod.buildToolsCatalogResult as BuildFn;
+      if (typeof mod.buildToolsCatalogResult === "function")
+        return mod.buildToolsCatalogResult as BuildFn;
     } catch {
       // unreadable/non-importable candidate → keep scanning
     }
@@ -172,8 +176,9 @@ function readStringArray(value: unknown): string[] {
 
 /** Read an agent's `tools` config block from the host config. */
 function findAgentTools(cfg: unknown, agentId: string): AgentToolsConfigShape | undefined {
-  const list = ((cfg as Record<string, unknown> | undefined)?.agents as Record<string, unknown> | undefined)
-    ?.list as Array<Record<string, unknown>> | undefined;
+  const list = (
+    (cfg as Record<string, unknown> | undefined)?.agents as Record<string, unknown> | undefined
+  )?.list as Array<Record<string, unknown>> | undefined;
   if (!Array.isArray(list)) return undefined;
   const entry = list.find((a) => a && typeof a === "object" && normalizeAgentId(a.id) === agentId);
   return entry?.tools as AgentToolsConfigShape | undefined;
@@ -183,7 +188,10 @@ function findAgentTools(cfg: unknown, agentId: string): AgentToolsConfigShape |
  * The agent's full tool catalog with per-tool effective state, or null if the core
  * catalog builder can't be located.
  */
-export async function buildAgentToolsCatalog(cfg: unknown, agentId: string): Promise<AgentToolsCatalog | null> {
+export async function buildAgentToolsCatalog(
+  cfg: unknown,
+  agentId: string,
+): Promise<AgentToolsCatalog | null> {
   const build = await loadBuildFn();
   if (!build) return null;
   // Snapshot the channel registry so we can undo the build's `surface:"channel"` re-pin
@@ -214,7 +222,8 @@ export async function buildAgentToolsCatalog(cfg: unknown, agentId: string): Pro
   }
 
   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/src/upgrade-runtime.ts

@@ -28,7 +28,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
@@ -42,7 +42,9 @@ let upgradeRuntime: UpgradeRuntime | null = null;
 
 export function setUpgradeRuntime(api: OpenClawPluginApi): void {
   const runtime = api.runtime as unknown as {
-    system?: { runCommandWithTimeout?: (argv: string[], opts: unknown) => Promise<SpawnResultLike> };
+    system?: {
+      runCommandWithTimeout?: (argv: string[], opts: unknown) => Promise<SpawnResultLike>;
+    };
     config: {
       current: () => unknown;
       mutateConfigFile?: (params: unknown) => Promise<unknown>;

package/src/version.ts

@@ -22,7 +22,11 @@ function resolvePluginVersion(): string {
       const path = fileURLToPath(new URL(rel, import.meta.url));
       const raw = readFileSync(path, "utf8");
       const pkg = JSON.parse(raw) as { name?: string; version?: string };
-      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;
       }
     } catch {

package/tsconfig.json

@@ -14,4 +14,4 @@
   },
   "include": ["index.ts", "src/**/*.ts", "src/**/*.d.ts"],
   "exclude": ["src/e2e/**", "src/**/*.test.ts", "src/test-support/**", "scripts/**"]
-}
+}