@promptbook/cli 0.113.0-0 → 0.113.0-10

package/apps/agents-server/src/{components/Homepage → utils/agentOrganization}/hiddenFolders.ts

@@ -1,24 +1,53 @@
-import type { AgentOrganizationAgent, AgentOrganizationFolder } from '../../utils/agentOrganization/types';
-import { buildFolderMaps, collectDescendantFolderIds } from './agentOrganizationUtils';
+import { buildFolderTree, collectDescendantFolderIds } from './folderTree';
 
 /**
- * Prefix that marks a folder as hidden from default homepage listings.
+ * Prefix that marks a folder as hidden from default organization listings.
  *
  * Folders whose name starts with this prefix (for example `.core`) are excluded
- * from the agents list, graph, and office views unless the user explicitly toggles
- * hidden-folder visibility on.
+ * from default agent/folder listings unless the caller explicitly opts into showing them.
  *
- * @private function of AgentsList
+ * @private shared hidden-folder helper for Agents Server
  */
 export const HIDDEN_FOLDER_NAME_PREFIX = '.';
 
+/**
+ * Minimal folder shape required by the hidden-folder utilities.
+ *
+ * @private shared hidden-folder helper for Agents Server
+ */
+type HiddenFolderTreeFolder = {
+    readonly id: number;
+    readonly name: string;
+    readonly parentId: number | null;
+};
+
+/**
+ * Minimal agent shape required by the hidden-folder utilities.
+ *
+ * @private shared hidden-folder helper for Agents Server
+ */
+type HiddenFolderTreeAgent = {
+    readonly folderId: number | null;
+};
+
+/**
+ * Result of removing hidden folders and their agents from one organization snapshot.
+ *
+ * @private shared hidden-folder helper for Agents Server
+ */
+type FilterHiddenFolderTreeResult<TFolder extends HiddenFolderTreeFolder, TAgent extends HiddenFolderTreeAgent> = {
+    readonly folders: TFolder[];
+    readonly agents: TAgent[];
+    readonly hasHiddenFolders: boolean;
+};
+
 /**
  * Determines whether one folder name represents a hidden folder.
  *
  * @param folderName - Folder name persisted in the database.
  * @returns True when the folder should be hidden by default.
  *
- * @private function of AgentsList
+ * @private shared hidden-folder helper for Agents Server
  */
 export function isHiddenFolderName(folderName: string): boolean {
     return folderName.startsWith(HIDDEN_FOLDER_NAME_PREFIX);
@@ -34,10 +63,10 @@ export function isHiddenFolderName(folderName: string): boolean {
  * @param folders - All folders in the organization.
  * @returns Set of folder identifiers that should be excluded from default views.
  *
- * @private function of AgentsList
+ * @private shared hidden-folder helper for Agents Server
  */
-export function collectHiddenFolderIds(folders: ReadonlyArray<AgentOrganizationFolder>): Set<number> {
-    const folderMaps = buildFolderMaps(folders);
+export function collectHiddenFolderIds(folders: ReadonlyArray<HiddenFolderTreeFolder>): Set<number> {
+    const folderTree = buildFolderTree(Array.from(folders));
     const hiddenFolderIds = new Set<number>();
 
     for (const folder of folders) {
@@ -45,7 +74,7 @@ export function collectHiddenFolderIds(folders: ReadonlyArray<AgentOrganizationF
             continue;
         }
 
-        for (const descendantId of collectDescendantFolderIds(folder.id, folderMaps.childrenByParentId)) {
+        for (const descendantId of collectDescendantFolderIds(folder.id, folderTree.childrenByParentId)) {
             hiddenFolderIds.add(descendantId);
         }
     }
@@ -53,37 +82,28 @@ export function collectHiddenFolderIds(folders: ReadonlyArray<AgentOrganizationF
     return hiddenFolderIds;
 }
 
-/**
- * Result of removing hidden folders and their agents from one organization snapshot.
- *
- * @private function of AgentsList
- */
-type FilterHiddenFolderTreeResult = {
-    readonly folders: AgentOrganizationFolder[];
-    readonly agents: AgentOrganizationAgent[];
-    readonly hasHiddenFolders: boolean;
-};
-
 /**
  * Removes hidden folders and their agents from one organization snapshot.
  *
  * When `isHiddenFoldersVisible` is true the snapshot passes through unchanged so the
  * caller can render every folder. When false, all hidden folders (including their
- * descendants and the agents inside them) are removed in one pass — keeping the
- * single filtering rule in one place across list, graph, and office views.
+ * descendants and the agents inside them) are removed in one pass.
  *
  * @param folders - All folders in the organization.
  * @param agents - All agents in the organization.
  * @param isHiddenFoldersVisible - Whether the user has opted to display hidden folders.
  * @returns Filtered organization snapshot together with the unfiltered detection flag.
  *
- * @private function of AgentsList
+ * @private shared hidden-folder helper for Agents Server
  */
-export function filterHiddenFolderTree(
-    folders: ReadonlyArray<AgentOrganizationFolder>,
-    agents: ReadonlyArray<AgentOrganizationAgent>,
+export function filterHiddenFolderTree<
+    TFolder extends HiddenFolderTreeFolder,
+    TAgent extends HiddenFolderTreeAgent,
+>(
+    folders: ReadonlyArray<TFolder>,
+    agents: ReadonlyArray<TAgent>,
     isHiddenFoldersVisible: boolean,
-): FilterHiddenFolderTreeResult {
+): FilterHiddenFolderTreeResult<TFolder, TAgent> {
     const hasHiddenFolders = folders.some((folder) => isHiddenFolderName(folder.name));
 
     if (isHiddenFoldersVisible || !hasHiddenFolders) {

package/apps/agents-server/src/utils/agentOrganization/loadAgentOrganizationState.ts

@@ -2,7 +2,9 @@ import type { AgentBasicInformation } from '../../../../../src/book-2.0/agent-so
 import { $getTableName } from '../../database/$getTableName';
 import { $provideSupabaseForServer } from '../../database/$provideSupabaseForServer';
 import type { AgentsServerDatabase } from '../../database/schema';
+import { $provideAgentCollectionForServer } from '../../tools/$provideAgentCollectionForServer';
 import { $provideAgentReferenceResolver } from '../agentReferenceResolver/$provideAgentReferenceResolver';
+import { createLocalAgentSourceImporter } from '../createLocalAgentSourceImporter';
 import { getCurrentUser } from '../getCurrentUser';
 import { getWellKnownAgentUrl } from '../getWellKnownAgentUrl';
 import { resolveCurrentOrInternalServerOrigin } from '../resolveCurrentOrInternalServerOrigin';
@@ -187,14 +189,24 @@ async function loadResolvedOrganizationSnapshot(options: {
 
     const localServerUrl = await resolveCurrentOrInternalServerOrigin();
     const agentReferenceResolver = await $provideAgentReferenceResolver();
+    const adamAgentUrl = await getWellKnownAgentUrl('ADAM');
+    const collection = await $provideAgentCollectionForServer();
+    const agentSourceImporter = createLocalAgentSourceImporter({
+        collection,
+        localServerUrls: [localServerUrl],
+        localAgentUrls: [adamAgentUrl],
+        adamAgentUrl,
+        fallbackResolver: agentReferenceResolver,
+    });
     const resolvedAgents = await resolveStoredAgentStates(
         (agentResult.data || []) as Array<
             Pick<AgentRow, 'agentName' | 'agentSource' | 'permanentId' | 'visibility' | 'folderId' | 'sortOrder'>
         >,
         {
             localServerUrl,
-            adamAgentUrl: await getWellKnownAgentUrl('ADAM'),
+            adamAgentUrl,
             agentReferenceResolver,
+            agentSourceImporter,
         },
     );
     const agents = resolvedAgents.map((agent) =>