@pasko70/pibo 2.2.2 → 2.2.4

package/dist/agent-runtimes/omp/host-tools.js

@@ -90,7 +90,7 @@ export class OmpHostToolBridge {
             wire.push({
                 name: def.name,
                 description: typeof def.description === "string" ? def.description : "",
-                inputSchema: toolInputSchema(def),
+                parameters: toolInputSchema(def),
             });
         }
         const result = await this.client.request({ type: "set_host_tools", tools: wire }, "set_host_tools");

package/dist/apps/chat/agent-store.js

@@ -15,6 +15,7 @@ export function previewCustomAgentCreate(input, options = {}) {
         profileName: input.displayName,
         displayName: input.displayName,
         profileAliases: [],
+        folderId: input.folderId,
         description: input.description,
         runtimeInstanceId: sanitizeRuntimeInstanceId(input.runtimeInstanceId),
         runtimeOptions: cloneRuntimeOptions(input.runtimeOptions),
@@ -48,6 +49,7 @@ export function previewCustomAgentUpdate(existing, input, options = {}) {
         ...existing,
         profileName,
         displayName: input.displayName ?? existing.displayName,
+        folderId: input.folderId === undefined ? existing.folderId : input.folderId ?? undefined,
         description: input.description === undefined ? existing.description : input.description,
         runtimeInstanceId: input.runtimeInstanceId === undefined ? existing.runtimeInstanceId : sanitizeRuntimeInstanceId(input.runtimeInstanceId),
         runtimeOptions: input.runtimeOptions === undefined ? existing.runtimeOptions : cloneRuntimeOptions(input.runtimeOptions),
@@ -88,11 +90,19 @@ export class CustomAgentStore {
         if (resolvedPath !== ":memory:")
             this.db.exec("PRAGMA journal_mode = WAL");
         this.db.exec(`
+			CREATE TABLE IF NOT EXISTS chat_agent_folders (
+				id TEXT PRIMARY KEY,
+				name TEXT NOT NULL COLLATE NOCASE UNIQUE,
+				created_at TEXT NOT NULL,
+				updated_at TEXT NOT NULL
+			);
+
 			CREATE TABLE IF NOT EXISTS chat_agents (
 				id TEXT PRIMARY KEY,
 				profile_name TEXT NOT NULL UNIQUE,
 				display_name TEXT NOT NULL,
 				description TEXT,
+				folder_id TEXT REFERENCES chat_agent_folders(id) ON DELETE SET NULL,
 				runtime_instance_id TEXT NOT NULL DEFAULT 'pi',
 				runtime_options_json TEXT NOT NULL DEFAULT '{}',
 				native_subagents INTEGER,
@@ -121,6 +131,7 @@ export class CustomAgentStore {
 			);
 
 		`);
+        this.migrateAgentFolderColumn();
         this.migrateProfileAliasTable();
         this.migrateArchivedAtColumn();
         this.migrateAutoContextFilesColumn();
@@ -137,6 +148,38 @@ export class CustomAgentStore {
         this.migrateLegacyProfileNames();
         this.migrateDuplicateProfileNames();
     }
+    listFolders() {
+        const rows = this.db.prepare("SELECT * FROM chat_agent_folders ORDER BY name COLLATE NOCASE ASC, created_at ASC").all();
+        return rows.map(folderFromRow);
+    }
+    getFolder(id) {
+        const row = this.db.prepare("SELECT * FROM chat_agent_folders WHERE id = ?").get(id);
+        return row ? folderFromRow(row) : undefined;
+    }
+    createFolder(name) {
+        const normalizedName = normalizeCustomAgentFolderName(name);
+        this.requireFolderNameAvailable(normalizedName);
+        const now = new Date().toISOString();
+        const id = `agent_folder_${randomUUID()}`;
+        this.db.prepare("INSERT INTO chat_agent_folders (id, name, created_at, updated_at) VALUES (?, ?, ?, ?)").run(id, normalizedName, now, now);
+        return this.getFolder(id);
+    }
+    renameFolder(id, name) {
+        const existing = this.getFolder(id);
+        if (!existing)
+            return undefined;
+        const normalizedName = normalizeCustomAgentFolderName(name);
+        this.requireFolderNameAvailable(normalizedName, id);
+        this.db.prepare("UPDATE chat_agent_folders SET name = ?, updated_at = ? WHERE id = ?").run(normalizedName, new Date().toISOString(), id);
+        return this.getFolder(id);
+    }
+    deleteFolder(id) {
+        const assigned = this.db.prepare("SELECT COUNT(*) AS count FROM chat_agents WHERE folder_id = ?").get(id);
+        if (assigned.count > 0)
+            throw new Error("Move agents out of this folder before deleting it");
+        const result = this.db.prepare("DELETE FROM chat_agent_folders WHERE id = ?").run(id);
+        return Number(result.changes ?? 0) > 0;
+    }
     list(options = {}) {
         this.migrateLegacyProfileNames();
         this.migrateDuplicateProfileNames();
@@ -153,6 +196,7 @@ export class CustomAgentStore {
     create(input) {
         this.migrateLegacyProfileNames();
         this.requireProfileNameAvailable(input.displayName);
+        this.requireFolderExists(input.folderId);
         const agent = previewCustomAgentCreate(input);
         this.insert(agent);
         const created = this.get(agent.id);
@@ -167,6 +211,7 @@ export class CustomAgentStore {
             return undefined;
         const profileName = input.displayName ?? existing.displayName;
         this.requireProfileNameAvailable(profileName, id);
+        this.requireFolderExists(input.folderId);
         const updated = previewCustomAgentUpdate(existing, input);
         this.db
             .prepare(`
@@ -174,6 +219,7 @@ export class CustomAgentStore {
 					profile_name = ?,
 					display_name = ?,
 					description = ?,
+					folder_id = ?,
 					runtime_instance_id = ?,
 					runtime_options_json = ?,
 					native_subagents = ?,
@@ -199,7 +245,7 @@ export class CustomAgentStore {
 					updated_at = ?
 				WHERE id = ?
 			`)
-            .run(updated.profileName, updated.displayName, updated.description ?? null, updated.runtimeInstanceId, JSON.stringify(updated.runtimeOptions), serializeBoolean(updated.nativeSubagents), JSON.stringify(updated.nativeTools), JSON.stringify(updated.skills), JSON.stringify(updated.contextFiles), JSON.stringify(sanitizeSubagents(updated.subagents)), JSON.stringify(updated.mcpServers), JSON.stringify(updated.piPackages), updated.mainModel ? JSON.stringify(updated.mainModel) : null, updated.subagentModel ? JSON.stringify(updated.subagentModel) : null, updated.thinkingLevel ?? null, updated.mainThinkingLevel ?? null, updated.subagentThinkingLevel ?? null, serializeBoolean(updated.fast), serializeBoolean(updated.mainFast), serializeBoolean(updated.subagentFast), updated.builtinTools, JSON.stringify(updated.builtinToolNames), updated.autoContextFiles ? 1 : 0, updated.runControl ? 1 : 0, updated.goalControl ? 1 : 0, updated.updatedAt, id);
+            .run(updated.profileName, updated.displayName, updated.description ?? null, updated.folderId ?? null, updated.runtimeInstanceId, JSON.stringify(updated.runtimeOptions), serializeBoolean(updated.nativeSubagents), JSON.stringify(updated.nativeTools), JSON.stringify(updated.skills), JSON.stringify(updated.contextFiles), JSON.stringify(sanitizeSubagents(updated.subagents)), JSON.stringify(updated.mcpServers), JSON.stringify(updated.piPackages), updated.mainModel ? JSON.stringify(updated.mainModel) : null, updated.subagentModel ? JSON.stringify(updated.subagentModel) : null, updated.thinkingLevel ?? null, updated.mainThinkingLevel ?? null, updated.subagentThinkingLevel ?? null, serializeBoolean(updated.fast), serializeBoolean(updated.mainFast), serializeBoolean(updated.subagentFast), updated.builtinTools, JSON.stringify(updated.builtinToolNames), updated.autoContextFiles ? 1 : 0, updated.runControl ? 1 : 0, updated.goalControl ? 1 : 0, updated.updatedAt, id);
         return this.get(id);
     }
     setArchived(id, archived) {
@@ -229,6 +275,7 @@ export class CustomAgentStore {
 					profile_name,
 					display_name,
 					description,
+					folder_id,
 					runtime_instance_id,
 					runtime_options_json,
 					native_subagents,
@@ -254,9 +301,20 @@ export class CustomAgentStore {
 					created_at,
 					updated_at,
 					archived_at
-				) VALUES (${Array.from({ length: 29 }, () => "?").join(", ")})
+				) VALUES (${Array.from({ length: 30 }, () => "?").join(", ")})
 			`)
-            .run(agent.id, agent.profileName, agent.displayName, agent.description ?? null, agent.runtimeInstanceId, JSON.stringify(agent.runtimeOptions), serializeBoolean(agent.nativeSubagents), JSON.stringify(agent.nativeTools), JSON.stringify(agent.skills), JSON.stringify(agent.contextFiles), JSON.stringify(sanitizeSubagents(agent.subagents)), JSON.stringify(agent.mcpServers), JSON.stringify(agent.piPackages), agent.mainModel ? JSON.stringify(agent.mainModel) : null, agent.subagentModel ? JSON.stringify(agent.subagentModel) : null, agent.thinkingLevel ?? null, agent.mainThinkingLevel ?? null, agent.subagentThinkingLevel ?? null, serializeBoolean(agent.fast), serializeBoolean(agent.mainFast), serializeBoolean(agent.subagentFast), agent.builtinTools, JSON.stringify(agent.builtinToolNames), agent.autoContextFiles ? 1 : 0, agent.runControl ? 1 : 0, agent.goalControl ? 1 : 0, agent.createdAt, agent.updatedAt, agent.archivedAt ?? null);
+            .run(agent.id, agent.profileName, agent.displayName, agent.description ?? null, agent.folderId ?? null, agent.runtimeInstanceId, JSON.stringify(agent.runtimeOptions), serializeBoolean(agent.nativeSubagents), JSON.stringify(agent.nativeTools), JSON.stringify(agent.skills), JSON.stringify(agent.contextFiles), JSON.stringify(sanitizeSubagents(agent.subagents)), JSON.stringify(agent.mcpServers), JSON.stringify(agent.piPackages), agent.mainModel ? JSON.stringify(agent.mainModel) : null, agent.subagentModel ? JSON.stringify(agent.subagentModel) : null, agent.thinkingLevel ?? null, agent.mainThinkingLevel ?? null, agent.subagentThinkingLevel ?? null, serializeBoolean(agent.fast), serializeBoolean(agent.mainFast), serializeBoolean(agent.subagentFast), agent.builtinTools, JSON.stringify(agent.builtinToolNames), agent.autoContextFiles ? 1 : 0, agent.runControl ? 1 : 0, agent.goalControl ? 1 : 0, agent.createdAt, agent.updatedAt, agent.archivedAt ?? null);
+    }
+    requireFolderExists(folderId) {
+        if (folderId === undefined || folderId === null)
+            return;
+        if (!this.getFolder(folderId))
+            throw new Error(`Agent folder "${folderId}" does not exist`);
+    }
+    requireFolderNameAvailable(name, currentId) {
+        const row = this.db.prepare("SELECT id FROM chat_agent_folders WHERE name = ? COLLATE NOCASE").get(name);
+        if (row && row.id !== currentId)
+            throw new Error(`Agent folder "${name}" already exists`);
     }
     requireProfileNameAvailable(profileName, currentId) {
         const row = this.db.prepare("SELECT id FROM chat_agents WHERE profile_name = ?").get(profileName);
@@ -306,6 +364,12 @@ export class CustomAgentStore {
                 .run(nextName, nextName, row.id);
         }
     }
+    migrateAgentFolderColumn() {
+        if (!this.tableColumns().has("folder_id")) {
+            this.db.prepare("ALTER TABLE chat_agents ADD COLUMN folder_id TEXT REFERENCES chat_agent_folders(id) ON DELETE SET NULL").run();
+        }
+        this.db.exec("CREATE INDEX IF NOT EXISTS chat_agents_folder_id_idx ON chat_agents(folder_id)");
+    }
     migrateProfileAliasTable() {
         this.db.exec(`
 			CREATE TABLE IF NOT EXISTS chat_agent_profile_aliases (
@@ -573,6 +637,7 @@ function agentFromRow(row, profileAliases) {
         profileName: row.profile_name,
         displayName: row.display_name,
         profileAliases: profileAliases.filter((alias) => alias !== row.profile_name),
+        folderId: row.folder_id ?? undefined,
         description: row.description ?? undefined,
         runtimeInstanceId: sanitizeRuntimeInstanceId(row.runtime_instance_id),
         runtimeOptions: parseRuntimeOptions(row.runtime_options_json),
@@ -601,6 +666,22 @@ function agentFromRow(row, profileAliases) {
         archivedAt: row.archived_at ?? undefined,
     };
 }
+function folderFromRow(row) {
+    return {
+        id: row.id,
+        name: row.name,
+        createdAt: row.created_at,
+        updatedAt: row.updated_at,
+    };
+}
+export function normalizeCustomAgentFolderName(value) {
+    const name = value.replace(/\s+/g, " ").trim();
+    if (!name)
+        throw new Error("Agent folder name is required");
+    if (name.length > 80)
+        throw new Error("Agent folder name is too long");
+    return name;
+}
 function parseStringArray(value) {
     try {
         const parsed = JSON.parse(value);

package/dist/apps/chat/chat-api-routes.js

@@ -21,6 +21,20 @@ export function roomResourcePath(pathname) {
         throw new PiboWebHttpError("Invalid room id", 400);
     }
 }
+export function agentFolderResourceId(pathname) {
+    const prefix = `${CHAT_WEB_API_PREFIX}/agent-folders/`;
+    if (!pathname.startsWith(prefix))
+        return undefined;
+    const encodedId = pathname.slice(prefix.length);
+    if (!encodedId || encodedId.includes("/"))
+        return undefined;
+    try {
+        return decodeURIComponent(encodedId);
+    }
+    catch {
+        throw new PiboWebHttpError("Invalid agent folder id", 400);
+    }
+}
 export function agentResourceId(pathname) {
     const prefix = `${CHAT_WEB_API_PREFIX}/agents/`;
     if (!pathname.startsWith(prefix))

package/dist/apps/chat/chat-request-normalizers.js

@@ -116,6 +116,30 @@ export function normalizeAgentDisplayName(value, fallback = "new-agent") {
     }
     return name;
 }
+export function normalizeAgentFolderName(value) {
+    if (typeof value !== "string")
+        throw new PiboWebHttpError("Agent folder name must be a string", 400);
+    const name = value.replace(/\s+/g, " ").trim();
+    if (!name)
+        throw new PiboWebHttpError("Agent folder name is required", 400);
+    if (name.length > 80)
+        throw new PiboWebHttpError("Agent folder name is too long", 400);
+    return name;
+}
+export function normalizeAgentFolderId(value) {
+    if (value === undefined)
+        return undefined;
+    if (value === null || value === "")
+        return null;
+    if (typeof value !== "string")
+        throw new PiboWebHttpError("Agent folder id must be a string", 400);
+    const folderId = value.trim();
+    if (!folderId)
+        return null;
+    if (folderId.length > 160)
+        throw new PiboWebHttpError("Agent folder id is too long", 400);
+    return folderId;
+}
 export function normalizeAgentDescription(value) {
     if (value === undefined || value === null)
         return undefined;
@@ -661,6 +685,7 @@ export function createAgentInput(body) {
     return {
         displayName: normalizeAgentDisplayName(body.displayName),
         description: normalizeAgentDescription(body.description),
+        folderId: normalizeAgentFolderId(body.folderId) ?? undefined,
         runtimeInstanceId: normalizeAgentRuntimeInstanceId(body.runtimeInstanceId),
         runtimeOptions: normalizeAgentRuntimeOptions(body.runtimeOptions),
         nativeSubagents: normalizeNativeSubagents(body.nativeSubagents),
@@ -691,6 +716,8 @@ export function createAgentUpdate(body) {
         update.displayName = normalizeAgentDisplayName(body.displayName);
     if (body.description !== undefined)
         update.description = normalizeAgentDescription(body.description);
+    if (body.folderId !== undefined)
+        update.folderId = normalizeAgentFolderId(body.folderId);
     if (body.runtimeInstanceId !== undefined)
         update.runtimeInstanceId = normalizeAgentRuntimeInstanceId(body.runtimeInstanceId);
     if (body.runtimeOptions !== undefined)

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

@@ -50,8 +50,8 @@ import { ensurePrivateChatUploadDirectory, prepareChatFileAttachments, resolveDo
 import { chatSettingsRoute, chatSettingsRouteInvalidatesBootstrapCatalog, chatSettingsRouteRequiresSameOrigin, handleChatSettingsRoute, } from "./chat-settings-routes.js";
 import { chatCapabilityRoute, chatCapabilityRouteRequiresSameOrigin, handleChatCapabilityRoute, } from "./chat-capability-routes.js";
 import { chatUserSkillRoute, chatUserSkillRouteRequiresSameOrigin, handleChatUserSkillRoute, syncChatUserSkills, } from "./chat-user-skill-routes.js";
-import { CHAT_WEB_API_PREFIX, agentResourceId, projectResourcePath, projectSessionResourceId, projectWorkflowHumanActionsResource, projectWorkflowSessionStartResource, roomResourcePath, sessionActionResource, sessionResourceId, signalResource, workflowArchiveResourceId, workflowCatalogResourceId, workflowDraftActionResource, workflowDraftManualTriggerRunResource, workflowDraftResourceId, workflowDuplicateResourceId, workflowNextDraftResourceId, workflowPickerKind, workflowPromptAssetResourceId, workflowVersionResource, } from "./chat-api-routes.js";
-import { assertProjectSessionPatchFields, buildStreamingFixtureSchedule, createAgentInput, createAgentUpdate, createRoomUpdate, createSessionUpdate, normalizeAgentArchived, normalizeClientTxnId, normalizeMessageDelivery, normalizeMessageText, normalizeParentRoomId, normalizeProjectArchived, normalizeProjectDescription, normalizeProjectPath, normalizeProjectSessionArchived, normalizeRoomDeleteConfirmation, normalizeRoomName, normalizeRoomTopic, normalizeRoomType, normalizeRoomWorkspace, normalizeSessionDeleteConfirmation, normalizeSessionTitle, normalizeStreamingFixtureCadenceMs, normalizeStreamingFixtureDeltas, normalizeStreamingFixtureMix, normalizeStreamingFixturePreludeMessages, normalizeStreamingFixturePreludeOnly, normalizeStreamingFixtureProfile, normalizeStreamingFixtureSuppressLiveDeltas, normalizeStreamingFixtureTraceSnapshots, resolveCreateSessionProfile, } from "./chat-request-normalizers.js";
+import { CHAT_WEB_API_PREFIX, agentFolderResourceId, agentResourceId, projectResourcePath, projectSessionResourceId, projectWorkflowHumanActionsResource, projectWorkflowSessionStartResource, roomResourcePath, sessionActionResource, sessionResourceId, signalResource, workflowArchiveResourceId, workflowCatalogResourceId, workflowDraftActionResource, workflowDraftManualTriggerRunResource, workflowDraftResourceId, workflowDuplicateResourceId, workflowNextDraftResourceId, workflowPickerKind, workflowPromptAssetResourceId, workflowVersionResource, } from "./chat-api-routes.js";
+import { assertProjectSessionPatchFields, buildStreamingFixtureSchedule, createAgentInput, createAgentUpdate, createRoomUpdate, createSessionUpdate, normalizeAgentArchived, normalizeAgentFolderName, normalizeClientTxnId, normalizeMessageDelivery, normalizeMessageText, normalizeParentRoomId, normalizeProjectArchived, normalizeProjectDescription, normalizeProjectPath, normalizeProjectSessionArchived, normalizeRoomDeleteConfirmation, normalizeRoomName, normalizeRoomTopic, normalizeRoomType, normalizeRoomWorkspace, normalizeSessionDeleteConfirmation, normalizeSessionTitle, normalizeStreamingFixtureCadenceMs, normalizeStreamingFixtureDeltas, normalizeStreamingFixtureMix, normalizeStreamingFixturePreludeMessages, normalizeStreamingFixturePreludeOnly, normalizeStreamingFixtureProfile, normalizeStreamingFixtureSuppressLiveDeltas, normalizeStreamingFixtureTraceSnapshots, resolveCreateSessionProfile, } from "./chat-request-normalizers.js";
 import { ChatWorkflowArchiveStore, ChatWorkflowDraftStore, ChatWorkflowLifecycleEventStore, ChatWorkflowPromptAssetStore, ChatWorkflowPublishedVersionStore, ChatWorkflowTombstoneStore, hashWorkflowDefinitionJson, normalizeWorkflowPromptAssetLabel, sanitizeWorkflowDiagnostics, } from "./workflow-persistence.js";
 import { normalizeProjectWorkflowHumanActionBody, projectWorkflowHumanActionDiagnosticResponse, projectWorkflowHumanActionLifecyclePayload, projectWorkflowHumanActionRuntimeDiagnostic, projectWorkflowHumanActionSubmittedLifecyclePayload, projectWorkflowPendingHumanActionFromToken, validateProjectWorkflowHumanActionRequest, } from "./project-workflow-human-actions.js";
 import { createProjectWorkflowRunCurrent, createProjectWorkflowSessionSnapshot, normalizeProjectWorkflowSessionConfiguration, workflowVersionFromSnapshot, } from "./project-workflow-sessions.js";
@@ -81,6 +81,7 @@ function loadBootstrapCatalog(state, context, webSession) {
     ]).then(([modelCatalog, agentCatalog]) => ({
         agents: context.channelContext.getProfiles?.() ?? [],
         customAgents: serializeCustomAgents(state.agentStore.list({ includeArchived: true }), context),
+        agentFolders: state.agentStore.listFolders(),
         modelDefaults: loadChatModelDefaults(process.cwd()),
         modelCatalog,
         agentCatalog,
@@ -904,6 +905,22 @@ function serializeCustomAgent(agent, context) {
 function serializeCustomAgents(agents, context) {
     return agents.map((agent) => serializeCustomAgent(agent, context));
 }
+function requireAgentFolder(state, folderId) {
+    const folder = state.agentStore.getFolder(folderId);
+    if (!folder)
+        throw new PiboWebHttpError("Agent folder not found", 404);
+    return folder;
+}
+function requireAgentFolderNameAvailable(state, name, currentId) {
+    const conflict = state.agentStore.listFolders().find((folder) => folder.id !== currentId && folder.name.localeCompare(name, undefined, { sensitivity: "accent" }) === 0);
+    if (conflict)
+        throw new PiboWebHttpError(`Agent folder "${name}" already exists`, 409);
+}
+function requireAgentFolderAssignmentAvailable(state, folderId) {
+    if (!folderId)
+        return;
+    requireAgentFolder(state, folderId);
+}
 const RUNTIME_PROFILE_UPDATE_FIELDS = new Set([
     "runtimeInstanceId",
     "runtimeOptions",
@@ -4280,6 +4297,43 @@ export function createChatWebApp(options = {}) {
                     invalidateBootstrapCatalogCache: () => invalidateBootstrapCatalogCache(state),
                 });
             }
+            if (url.pathname === `${CHAT_WEB_API_PREFIX}/agent-folders` && request.method === "GET") {
+                await requireSession(request, context);
+                return responseJson({ folders: state.agentStore.listFolders() });
+            }
+            if (url.pathname === `${CHAT_WEB_API_PREFIX}/agent-folders` && request.method === "POST") {
+                requireSameOriginJsonRequest(request);
+                await requireSession(request, context);
+                const body = await readJsonBody(request);
+                const name = normalizeAgentFolderName(body.name);
+                requireAgentFolderNameAvailable(state, name);
+                const folder = state.agentStore.createFolder(name);
+                invalidateBootstrapCatalogCache(state);
+                return responseJson({ folder }, { status: 201 });
+            }
+            const patchAgentFolderId = agentFolderResourceId(url.pathname);
+            if (patchAgentFolderId && request.method === "PATCH") {
+                requireSameOriginJsonRequest(request);
+                await requireSession(request, context);
+                requireAgentFolder(state, patchAgentFolderId);
+                const body = await readJsonBody(request);
+                const name = normalizeAgentFolderName(body.name);
+                requireAgentFolderNameAvailable(state, name, patchAgentFolderId);
+                const folder = state.agentStore.renameFolder(patchAgentFolderId, name);
+                invalidateBootstrapCatalogCache(state);
+                return responseJson({ folder: requireAgentFolder(state, folder?.id ?? patchAgentFolderId) });
+            }
+            if (patchAgentFolderId && request.method === "DELETE") {
+                requireSameOriginJsonRequest(request);
+                await requireSession(request, context);
+                const folder = requireAgentFolder(state, patchAgentFolderId);
+                const assignedAgent = state.agentStore.list({ includeArchived: true }).find((agent) => agent.folderId === folder.id);
+                if (assignedAgent)
+                    throw new PiboWebHttpError("Move agents out of this folder before deleting it.", 409);
+                state.agentStore.deleteFolder(folder.id);
+                invalidateBootstrapCatalogCache(state);
+                return responseJson({ deletedFolderId: folder.id });
+            }
             if (url.pathname === `${CHAT_WEB_API_PREFIX}/agents` && request.method === "GET") {
                 const webSession = await requireSession(request, context);
                 const includeArchived = parseBooleanSearchParam(url, "includeArchived");
@@ -4291,6 +4345,7 @@ export function createChatWebApp(options = {}) {
                 const body = await readJsonBody(request);
                 const input = normalizeCreateRuntimeFeatureOverrides(createAgentInput(body), context);
                 requireAgentProfileNameAvailable(state, context, input.displayName);
+                requireAgentFolderAssignmentAvailable(state, input.folderId);
                 await requireValidCustomAgentRuntime(previewCustomAgentCreate(input), context);
                 const agent = state.agentStore.create(input);
                 context.channelContext.upsertProfile?.(createCustomAgentProfileDefinition(agent));
@@ -4308,6 +4363,7 @@ export function createChatWebApp(options = {}) {
                 const archived = normalizeAgentArchived(body.archived);
                 if (update.displayName)
                     requireAgentProfileNameAvailable(state, context, update.displayName, existing.id);
+                requireAgentFolderAssignmentAvailable(state, update.folderId);
                 if (customAgentUpdateAffectsRuntime(update)) {
                     await requireValidCustomAgentRuntime(previewCustomAgentUpdate(existing, update), context);
                 }