Make directory examples actionable #170
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2103,27 +2103,86 @@ function normalizeDirectoryMcpServer(value: unknown): DirectoryMcpServerStatus | | |
| } | ||
| } | ||
|
|
||
| type DirectoryCacheOptions = { force?: boolean } | ||
|
|
||
| const directoryPluginCache = new Map<string, { promise: Promise<DirectoryPluginSummary[]> | null; value: DirectoryPluginSummary[] | null }>() | ||
| const directoryAppCache = new Map<string, { promise: Promise<DirectoryAppInfo[]> | null; value: DirectoryAppInfo[] | null }>() | ||
| const directoryComposioConnectorCache = new Map<string, { promise: Promise<DirectoryComposioConnectorPage> | null; value: DirectoryComposioConnectorPage | null }>() | ||
| let directoryComposioStatusCache: { promise: Promise<DirectoryComposioStatus> | null; value: DirectoryComposioStatus | null } = { promise: null, value: null } | ||
|
Comment on lines
+2108
to
+2111
Contributor
There was a problem hiding this comment. Bound cache growth to avoid long-session memory bloat. These Maps are unbounded, and 💡 Suggested direction (bounded cache helper)+const DIRECTORY_CACHE_MAX_ENTRIES = 200
+
+function setBoundedCacheEntry<K, V>(map: Map<K, V>, key: K, value: V): void {
+ if (map.has(key)) map.delete(key)
+ map.set(key, value)
+ if (map.size > DIRECTORY_CACHE_MAX_ENTRIES) {
+ const oldestKey = map.keys().next().value as K | undefined
+ if (oldestKey !== undefined) map.delete(oldestKey)
+ }
+}Then replace 🤖 Prompt for AI Agents |
||
|
|
||
| function directoryPluginsCacheKey(cwds?: string[]): string { | ||
| return (cwds ?? []).map((cwd) => cwd.trim()).filter(Boolean).join('\n') | ||
| } | ||
|
|
||
| function cloneDirectoryPluginRows(rows: DirectoryPluginSummary[]): DirectoryPluginSummary[] { | ||
| return rows.map((row) => ({ ...row, capabilities: [...row.capabilities], defaultPrompt: [...row.defaultPrompt], screenshotUrls: [...row.screenshotUrls], screenshots: [...row.screenshots] })) | ||
| } | ||
|
|
||
| function cloneDirectoryAppRows(rows: DirectoryAppInfo[]): DirectoryAppInfo[] { | ||
| return rows.map((row) => ({ ...row, pluginDisplayNames: [...row.pluginDisplayNames] })) | ||
| } | ||
|
|
||
| function cloneDirectoryComposioConnectorRows(rows: DirectoryComposioConnector[]): DirectoryComposioConnector[] { | ||
| return rows.map((row) => ({ | ||
| ...row, | ||
| authModes: [...row.authModes], | ||
| connectionStatuses: [...row.connectionStatuses], | ||
| })) | ||
| } | ||
|
|
||
| function cloneDirectoryComposioConnectorPage(page: DirectoryComposioConnectorPage): DirectoryComposioConnectorPage { | ||
| return { | ||
| data: cloneDirectoryComposioConnectorRows(page.data), | ||
| nextCursor: page.nextCursor, | ||
| total: page.total, | ||
| } | ||
| } | ||
|
|
||
| function clearDirectoryCatalogCaches(): void { | ||
| directoryPluginCache.clear() | ||
| directoryAppCache.clear() | ||
| directoryComposioConnectorCache.clear() | ||
| directoryComposioStatusCache = { promise: null, value: null } | ||
| } | ||
|
|
||
| export async function listDirectoryPlugins(cwds?: string[], options: DirectoryCacheOptions = {}): Promise<DirectoryPluginSummary[]> { | ||
| const cacheKey = directoryPluginsCacheKey(cwds) | ||
| const cached = directoryPluginCache.get(cacheKey) | ||
| if (!options.force && cached?.value) return cloneDirectoryPluginRows(cached.value) | ||
| if (!options.force && cached?.promise) return cloneDirectoryPluginRows(await cached.promise) | ||
|
|
||
| const params: Record<string, unknown> = {} | ||
| if (cwds && cwds.length > 0) params.cwds = cwds | ||
| const request = (async () => { | ||
| const payload = await callRpc<{ marketplaces?: unknown[] }>('plugin/list', params) | ||
| const plugins: DirectoryPluginSummary[] = [] | ||
| for (const marketplaceValue of payload.marketplaces ?? []) { | ||
| const marketplace = asRecord(marketplaceValue) | ||
| if (!marketplace) continue | ||
| const iface = asRecord(marketplace.interface) | ||
| const meta = { | ||
| name: readString(marketplace.name) ?? '', | ||
| displayName: readString(iface?.displayName ?? iface?.display_name) ?? '', | ||
| path: readString(marketplace.path), | ||
| } | ||
| const rows = Array.isArray(marketplace.plugins) ? marketplace.plugins : [] | ||
| for (const row of rows) { | ||
| const plugin = normalizeDirectoryPluginSummary(row, meta) | ||
| if (plugin) plugins.push(plugin) | ||
| } | ||
| } | ||
| directoryPluginCache.set(cacheKey, { promise: null, value: cloneDirectoryPluginRows(plugins) }) | ||
| return plugins | ||
| })() | ||
| directoryPluginCache.set(cacheKey, { promise: request, value: options.force ? null : cached?.value ?? null }) | ||
| try { | ||
| return cloneDirectoryPluginRows(await request) | ||
| } catch (error) { | ||
| if (directoryPluginCache.get(cacheKey)?.promise === request) { | ||
| directoryPluginCache.delete(cacheKey) | ||
| } | ||
| throw error | ||
| } | ||
| } | ||
|
|
||
| export async function readDirectoryPlugin(plugin: DirectoryPluginSummary): Promise<DirectoryPluginDetail> { | ||
|
|
@@ -2156,6 +2215,7 @@ export async function installDirectoryPlugin(plugin: DirectoryPluginSummary): Pr | |
| if (plugin.marketplacePath) params.marketplacePath = plugin.marketplacePath | ||
| if (plugin.remoteMarketplaceName) params.remoteMarketplaceName = plugin.remoteMarketplaceName | ||
| const payload = await callRpc<{ authPolicy?: string; auth_policy?: string; appsNeedingAuth?: unknown[]; apps_needing_auth?: unknown[] }>('plugin/install', params) | ||
| clearDirectoryCatalogCaches() | ||
| const apps = payload.appsNeedingAuth ?? payload.apps_needing_auth ?? [] | ||
| return { | ||
| authPolicy: readString(payload.authPolicy ?? payload.auth_policy) ?? '', | ||
|
|
@@ -2165,6 +2225,7 @@ export async function installDirectoryPlugin(plugin: DirectoryPluginSummary): Pr | |
|
|
||
| export async function uninstallDirectoryPlugin(pluginId: string): Promise<void> { | ||
| await callRpc('plugin/uninstall', { pluginId }) | ||
| clearDirectoryCatalogCaches() | ||
| } | ||
|
|
||
| export async function setDirectoryPluginEnabled(pluginId: string, enabled: boolean): Promise<void> { | ||
|
|
@@ -2174,25 +2235,43 @@ export async function setDirectoryPluginEnabled(pluginId: string, enabled: boole | |
| expectedVersion: null, | ||
| reloadUserConfig: true, | ||
| }) | ||
| directoryPluginCache.clear() | ||
| } | ||
|
|
||
| export async function listDirectoryApps(threadId?: string, options: DirectoryCacheOptions = {}): Promise<DirectoryAppInfo[]> { | ||
| const cacheKey = threadId?.trim() ?? '' | ||
| const cached = directoryAppCache.get(cacheKey) | ||
| if (!options.force && cached?.value) return cloneDirectoryAppRows(cached.value) | ||
| if (!options.force && cached?.promise) return cloneDirectoryAppRows(await cached.promise) | ||
|
|
||
| const request = (async () => { | ||
| const apps: DirectoryAppInfo[] = [] | ||
| let cursor: string | null = null | ||
| let catalogRank = 0 | ||
| do { | ||
| const params: Record<string, unknown> = { limit: 100 } | ||
| if (cursor) params.cursor = cursor | ||
| if (cacheKey) params.threadId = cacheKey | ||
| const payload = await callRpc<{ data?: unknown[]; nextCursor?: string | null; next_cursor?: string | null }>('app/list', params) | ||
| for (const item of payload.data ?? []) { | ||
| const app = normalizeDirectoryApp(item, catalogRank) | ||
| if (app) apps.push(app) | ||
| catalogRank += 1 | ||
| } | ||
| cursor = readString(payload.nextCursor ?? payload.next_cursor) | ||
| } while (cursor) | ||
| directoryAppCache.set(cacheKey, { promise: null, value: cloneDirectoryAppRows(apps) }) | ||
| return apps | ||
| })() | ||
| directoryAppCache.set(cacheKey, { promise: request, value: options.force ? null : cached?.value ?? null }) | ||
| try { | ||
| return cloneDirectoryAppRows(await request) | ||
| } catch (error) { | ||
| if (directoryAppCache.get(cacheKey)?.promise === request) { | ||
| directoryAppCache.delete(cacheKey) | ||
| } | ||
| throw error | ||
| } | ||
| } | ||
|
|
||
| export async function setDirectoryAppEnabled(appId: string, enabled: boolean): Promise<void> { | ||
|
|
@@ -2202,6 +2281,7 @@ export async function setDirectoryAppEnabled(appId: string, enabled: boolean): P | |
| expectedVersion: null, | ||
| reloadUserConfig: true, | ||
| }) | ||
| directoryAppCache.clear() | ||
| } | ||
|
|
||
| export async function listDirectoryMcpServers(): Promise<DirectoryMcpServerStatus[]> { | ||
|
|
@@ -2231,34 +2311,71 @@ export async function startDirectoryMcpLogin(name: string): Promise<DirectoryMcp | |
| } | ||
| } | ||
|
|
||
| export async function getDirectoryComposioStatus(options: DirectoryCacheOptions = {}): Promise<DirectoryComposioStatus> { | ||
| if (!options.force && directoryComposioStatusCache.value) return { ...directoryComposioStatusCache.value } | ||
| if (!options.force && directoryComposioStatusCache.promise) return { ...await directoryComposioStatusCache.promise } | ||
| const request = (async () => { | ||
| const response = await fetch('/codex-api/composio/status') | ||
| if (!response.ok) { | ||
| throw new Error(`Failed to load Composio status (${response.status})`) | ||
| } | ||
| const status = await response.json() as DirectoryComposioStatus | ||
| directoryComposioStatusCache = { promise: null, value: { ...status } } | ||
| return status | ||
| })() | ||
| directoryComposioStatusCache = { promise: request, value: options.force ? null : directoryComposioStatusCache.value } | ||
| try { | ||
| return { ...await request } | ||
| } catch (error) { | ||
| if (directoryComposioStatusCache.promise === request) { | ||
| directoryComposioStatusCache = { promise: null, value: null } | ||
| } | ||
| throw error | ||
| } | ||
| } | ||
|
|
||
| export async function listDirectoryComposioConnectors( | ||
| query = '', | ||
| cursor: string | null = null, | ||
| limit = 50, | ||
| options: DirectoryCacheOptions = {}, | ||
| ): Promise<DirectoryComposioConnectorPage> { | ||
| const normalizedQuery = query.trim() | ||
| const normalizedCursor = cursor?.trim() || '' | ||
| const normalizedLimit = limit && Number.isFinite(limit) ? Math.max(1, Math.floor(limit)) : 50 | ||
| const cacheKey = `${normalizedQuery}\n${normalizedCursor}\n${normalizedLimit}` | ||
| const cached = directoryComposioConnectorCache.get(cacheKey) | ||
| if (!options.force && cached?.value) return cloneDirectoryComposioConnectorPage(cached.value) | ||
| if (!options.force && cached?.promise) return cloneDirectoryComposioConnectorPage(await cached.promise) | ||
|
|
||
| const request = (async () => { | ||
| const params = new URLSearchParams() | ||
| if (normalizedQuery) params.set('query', normalizedQuery) | ||
| if (normalizedCursor) params.set('cursor', normalizedCursor) | ||
| params.set('limit', String(normalizedLimit)) | ||
| const suffix = params.toString() | ||
| const response = await fetch(`/codex-api/composio/connectors${suffix ? `?${suffix}` : ''}`) | ||
| if (!response.ok) { | ||
| throw new Error(`Failed to list Composio connectors (${response.status})`) | ||
| } | ||
| const payload = await response.json() as DirectoryComposioConnectorPage | { data?: DirectoryComposioConnector[]; nextCursor?: string | null; total?: number } | ||
| const page = { | ||
| data: Array.isArray(payload.data) ? payload.data : [], | ||
| nextCursor: typeof payload.nextCursor === 'string' && payload.nextCursor.length > 0 ? payload.nextCursor : null, | ||
| total: typeof payload.total === 'number' && Number.isFinite(payload.total) ? Math.max(0, Math.floor(payload.total)) : 0, | ||
| } | ||
| directoryComposioConnectorCache.set(cacheKey, { promise: null, value: cloneDirectoryComposioConnectorPage(page) }) | ||
| return page | ||
| })() | ||
| directoryComposioConnectorCache.set(cacheKey, { promise: request, value: options.force ? null : cached?.value ?? null }) | ||
| try { | ||
| return cloneDirectoryComposioConnectorPage(await request) | ||
| } catch (error) { | ||
| if (directoryComposioConnectorCache.get(cacheKey)?.promise === request) { | ||
| directoryComposioConnectorCache.delete(cacheKey) | ||
| } | ||
| throw error | ||
| } | ||
| } | ||
|
|
||
| export async function readDirectoryComposioConnector(slug: string): Promise<DirectoryComposioConnectorDetail> { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clear the scheduled preload timer on unmount.
Line 2018 schedules a timeout but the handle is not retained, so the callback can still fire after unmount and issue background requests from a stale lifecycle.
🧩 Proposed fix
🤖 Prompt for AI Agents