@pasko70/pibo 1.7.7 → 1.7.9

package/dist/apps/chat/chat-user-skill-routes.js

@@ -1,3 +1,4 @@
+import { normalizeUserSkillScope, normalizeWritableUserSkillScope } from "../../user-skills/manager.js";
 import { PiboWebHttpError, readJsonBody, responseJson } from "../../web/http.js";
 import { CHAT_WEB_API_PREFIX, userSkillResourceId } from "./chat-api-routes.js";
 import { normalizeUserSkillDescription, normalizeUserSkillEnabled, normalizeUserSkillMarkdown, normalizeUserSkillName, normalizeUserSkillUrl, } from "./chat-request-normalizers.js";
@@ -26,13 +27,19 @@ export function syncChatUserSkills(options) {
     const unregisterSkill = channelContext.unregisterSkill;
     if (!registerSkill || !unregisterSkill)
         return;
-    const userSkills = userSkillManager.list();
+    const userSkills = userSkillManager.list("all");
     const catalogSkills = channelContext.getCapabilityCatalog?.().skills ?? [];
     const catalogSkillByName = new Map(catalogSkills.map((skill) => [skill.name, skill]));
     const reservedSkillNames = new Set(catalogSkills.filter((skill) => skill.kind !== "user").map((skill) => skill.name));
-    const enabledNames = new Set(userSkills
-        .filter((skill) => skill.enabled && !reservedSkillNames.has(skill.name))
-        .map((skill) => skill.name));
+    const enabledSkillByName = new Map();
+    for (const skill of userSkills) {
+        if (!skill.enabled || reservedSkillNames.has(skill.name))
+            continue;
+        const existing = enabledSkillByName.get(skill.name);
+        if (!existing || skill.scope === "workspace")
+            enabledSkillByName.set(skill.name, skill);
+    }
+    const enabledNames = new Set(enabledSkillByName.keys());
     const syncedNames = previouslySyncedNames ?? new Set();
     // Unregister disabled, removed, or now built-in user skills. Avoid removing a
     // built-in/plugin skill if a promoted user skill has the same name.
@@ -43,10 +50,16 @@ export function syncChatUserSkills(options) {
                 unregisterSkill(name);
         }
     }
-    // Register only newly enabled user skills. Re-registering an already synced
-    // skill would trip the registry duplicate-skill guard and break the web UI.
-    for (const skill of userSkills) {
-        if (skill.enabled && !reservedSkillNames.has(skill.name) && !syncedNames.has(skill.name)) {
+    // Register the winning enabled skill per name. Workspace-local skills take
+    // precedence over global user skills with the same name; if the winning path
+    // changes, re-register the user skill so runtime context loads the right body.
+    for (const skill of enabledSkillByName.values()) {
+        const catalogSkill = catalogSkillByName.get(skill.name);
+        if (catalogSkill?.kind === "user" && catalogSkill.path !== skill.path) {
+            unregisterSkill(skill.name);
+            registerSkill({ name: skill.name, path: skill.path, enabled: true, kind: "user" });
+        }
+        else if (!syncedNames.has(skill.name)) {
             registerSkill({ name: skill.name, path: skill.path, enabled: true, kind: "user" });
         }
     }
@@ -55,7 +68,7 @@ export function syncChatUserSkills(options) {
 function assertUserSkillNameIsAvailable(options) {
     const { userSkillManager, channelContext, name, currentSkillId } = options;
     const currentSkill = currentSkillId ? userSkillManager.get(currentSkillId) : undefined;
-    const conflict = (channelContext.getCapabilityCatalog?.().skills ?? []).find((skill) => (skill.name === name && (!currentSkill || currentSkill.name !== name)));
+    const conflict = (channelContext.getCapabilityCatalog?.().skills ?? []).find((skill) => (skill.name === name && skill.kind !== "user" && (!currentSkill || currentSkill.name !== name)));
     if (conflict) {
         throw new PiboWebHttpError(`Skill name "${name}" conflicts with an existing registered skill`, 409);
     }
@@ -69,45 +82,63 @@ function syncAndInvalidate(options) {
     });
     options.invalidateBootstrapCatalogCache();
 }
+function requestScope(request, fallback = "all") {
+    return normalizeUserSkillScope(new URL(request.url).searchParams.get("scope") ?? undefined, fallback);
+}
+function bodyScope(body, fallback = "global") {
+    if (body.scope !== undefined && typeof body.scope !== "string") {
+        throw new PiboWebHttpError("Skill scope must be a string", 400);
+    }
+    try {
+        return normalizeWritableUserSkillScope(body.scope, fallback);
+    }
+    catch (error) {
+        throw new PiboWebHttpError(error instanceof Error ? error.message : String(error), 400);
+    }
+}
 export async function handleChatUserSkillRoute(options) {
     const { route, request, userSkillManager, channelContext } = options;
     switch (route.kind) {
         case "user-skills-list":
-            return responseJson({ skills: userSkillManager.list() });
+            return responseJson({ skills: userSkillManager.list(requestScope(request)) });
         case "user-skills-create": {
             const body = await readJsonBody(request);
+            const scope = bodyScope(body);
             const name = normalizeUserSkillName(body.name);
             assertUserSkillNameIsAvailable({ userSkillManager, channelContext, name });
             const skill = userSkillManager.create({
                 name,
                 description: normalizeUserSkillDescription(body.description ?? ""),
                 markdown: normalizeUserSkillMarkdown(body.markdown ?? ""),
-            });
+            }, scope);
             syncAndInvalidate(options);
             return responseJson({ skill }, { status: 201 });
         }
         case "user-skills-install": {
             const body = await readJsonBody(request);
-            const skill = await userSkillManager.installFromUrl(normalizeUserSkillUrl(body.url));
+            const scope = bodyScope(body);
+            const skill = await userSkillManager.installFromUrl(normalizeUserSkillUrl(body.url), scope);
             try {
                 assertUserSkillNameIsAvailable({ userSkillManager, channelContext, name: skill.name, currentSkillId: skill.id });
             }
             catch (error) {
-                userSkillManager.remove(skill.id);
+                userSkillManager.remove(skill.id, scope);
                 throw error;
             }
             syncAndInvalidate(options);
             return responseJson({ skill }, { status: 201 });
         }
         case "user-skill-read": {
-            const skill = userSkillManager.get(route.skillId);
+            const scope = requestScope(request);
+            const skill = userSkillManager.get(route.skillId, scope);
             if (!skill)
                 throw new PiboWebHttpError("Skill not found", 404);
-            const markdown = userSkillManager.getSkillMarkdown(skill.id);
+            const markdown = userSkillManager.getSkillMarkdown(skill.id, scope);
             return responseJson({ skill, markdown });
         }
         case "user-skill-update": {
-            const existing = userSkillManager.get(route.skillId);
+            const scope = requestScope(request);
+            const existing = userSkillManager.get(route.skillId, scope);
             if (!existing)
                 throw new PiboWebHttpError("Skill not found", 404);
             const body = await readJsonBody(request);
@@ -133,15 +164,16 @@ export async function handleChatUserSkillRoute(options) {
                     currentSkillId: existing.id,
                 });
             }
-            const skill = userSkillManager.update(existing.id, input);
+            const skill = userSkillManager.update(existing.id, input, scope);
             syncAndInvalidate(options);
             return responseJson({ skill });
         }
         case "user-skill-delete": {
-            const existing = userSkillManager.get(route.skillId);
+            const scope = requestScope(request);
+            const existing = userSkillManager.get(route.skillId, scope);
             if (!existing)
                 throw new PiboWebHttpError("Skill not found", 404);
-            userSkillManager.remove(existing.id);
+            userSkillManager.remove(existing.id, scope);
             syncAndInvalidate(options);
             return responseJson({ removedSkillId: existing.id });
         }

package/dist/apps/chat/model-catalog.js

@@ -1,6 +1,7 @@
 import { createAgentSessionServices } from "@mariozechner/pi-coding-agent";
 import { registerMiniMaxProvider } from "../../providers/minimax.js";
 import { registerGlmProvider } from "../../providers/glm.js";
+import { registerOpenAiGpt56Models } from "../../providers/openai-gpt56.js";
 export function buildModelCatalogFromRegistry(registry) {
     const providers = new Map();
     for (const model of registry.getAll()) {
@@ -45,6 +46,7 @@ export async function loadModelCatalogWithServices(createServices, cwd = process
 }
 export async function loadModelCatalog(cwd = process.cwd()) {
     return loadModelCatalogWithServices(createAgentSessionServices, cwd, (registry) => {
+        registerOpenAiGpt56Models(registry);
         registerMiniMaxProvider(registry);
         registerGlmProvider(registry);
     });

package/dist/apps/chat/web-app.js

@@ -22,7 +22,7 @@ import { createDefaultPiboReliabilityStore, PiboReliabilityStore } from "../../r
 import { listMcpServerInfos } from "../../mcp/agent-context.js";
 import { getDefaultPiboWorkspace } from "../../core/workspace.js";
 import { findPiPackage, listPiPackages } from "../../pi-packages/store.js";
-import { UserSkillManager } from "../../user-skills/manager.js";
+import { ScopedUserSkillManager } from "../../user-skills/manager.js";
 import { ChatDataIngestService } from "../../data/ingest-service.js";
 import { ChatEventCommandService } from "./data/event-command-service.js";
 import { ChatReadStateService } from "./data/read-state-service.js";
@@ -3029,7 +3029,7 @@ export function createChatWebApp(options = {}) {
         persistenceMetrics: createPersistenceMetrics(),
         resourceMetrics: createResourceMetrics(),
         eventLoopDelay,
-        userSkillManager: new UserSkillManager(os.homedir()),
+        userSkillManager: new ScopedUserSkillManager({ globalRoot: os.homedir(), workspaceRoot: process.cwd() }),
         workflowDraftStore: new ChatWorkflowDraftStore(dataStore),
         workflowPublishedVersionStore: new ChatWorkflowPublishedVersionStore(dataStore),
         workflowArchiveStore: new ChatWorkflowArchiveStore(dataStore),