@promptbook/cli 0.112.0-110 → 0.112.0-112

package/apps/agents-server/src/utils/importAgent.ts

@@ -39,16 +39,6 @@ type ImportedAgentCacheRecord = {
      */
     readonly source: string_book;
 
-    /**
-     * Fetch implementation that produced this cached record.
-     */
-    readonly fetchImplementation: typeof fetch;
-
-    /**
-     * Timestamp when the source was last fetched successfully.
-     */
-    readonly cachedAt: number;
-
     /**
      * Last observed ETag returned by the remote `/api/book` endpoint.
      */
@@ -65,22 +55,6 @@ type ImportedAgentCacheRecord = {
  */
 const IMPORTED_AGENT_CACHE = new Map<string, ImportedAgentCacheRecord>();
 
-/**
- * Freshness window for successful imported agent books.
- *
- * This avoids a remote revalidation round trip on every server render while
- * still allowing federated/default parent updates to appear shortly after.
- */
-const IMPORTED_AGENT_CACHE_FRESH_TTL_MS = 60_000;
-
-/**
- * Upper bound for fetching one imported agent book.
- *
- * Imported agents are used while rendering agent profiles and lists, so one slow
- * federated/default parent must not block the entire Agents Server page render.
- */
-const IMPORTED_AGENT_BOOK_FETCH_TIMEOUT_MS = 3_000;
-
 /**
  * In-flight remote imports deduplicated by canonical agent identifier.
  */
@@ -127,26 +101,6 @@ function createImportCacheKey(
     return agentIdentification.replace(/\/+$/g, '');
 }
 
-/**
- * Returns `true` when a cached imported agent can be reused without revalidation.
- *
- * @param cachedImport - Cached successful import record.
- * @returns Whether the cached import is still fresh enough for immediate reuse.
- */
-function isImportedAgentCacheFresh(cachedImport: ImportedAgentCacheRecord): boolean {
-    return Date.now() - cachedImport.cachedAt < IMPORTED_AGENT_CACHE_FRESH_TTL_MS;
-}
-
-/**
- * Returns `true` when the current fetch implementation can safely reuse the cached import.
- *
- * @param cachedImport - Cached successful import record.
- * @returns Whether the cache was produced by the active fetch implementation.
- */
-function isImportedAgentCacheCompatible(cachedImport: ImportedAgentCacheRecord): boolean {
-    return cachedImport.fetchImplementation === globalThis.fetch;
-}
-
 /**
  * Extracts one text/book payload from a successful HTTP response.
  *
@@ -199,14 +153,7 @@ export async function importAgent(
         inheritancePath: options?.inheritancePath,
     } satisfies ImportAgentOptions;
     const cacheKey = createImportCacheKey(agentIdentification);
-    const storedCachedImport = IMPORTED_AGENT_CACHE.get(cacheKey);
-    const cachedImport =
-        storedCachedImport && isImportedAgentCacheCompatible(storedCachedImport) ? storedCachedImport : undefined;
-
-    if (cachedImport && isImportedAgentCacheFresh(cachedImport)) {
-        return cachedImport.source;
-    }
-
+    const cachedImport = IMPORTED_AGENT_CACHE.get(cacheKey);
     const existingRequest = PENDING_IMPORTED_AGENT_REQUESTS.get(cacheKey);
     if (existingRequest) {
         return existingRequest;
@@ -228,7 +175,6 @@ export async function importAgent(
             const response: Response = await fetch(agentBookUrl, {
                 cache: 'no-store',
                 headers,
-                signal: AbortSignal.timeout(IMPORTED_AGENT_BOOK_FETCH_TIMEOUT_MS),
             });
 
             if (response.status === 304 && cachedImport) {
@@ -256,8 +202,6 @@ export async function importAgent(
             const source = await readImportedAgentSource(agentIdentification, response);
             IMPORTED_AGENT_CACHE.set(cacheKey, {
                 source,
-                fetchImplementation: globalThis.fetch,
-                cachedAt: Date.now(),
                 etag: response.headers.get('etag'),
                 lastModified: response.headers.get('last-modified'),
             });

package/apps/agents-server/src/utils/importAgentWithFallback.ts

@@ -19,10 +19,6 @@ type FailedImportedAgentFallbackCacheRecord = {
      * Generated fallback book returned for the failed import.
      */
     readonly fallbackSource: string_book;
-    /**
-     * Fetch implementation that produced this failed-import fallback.
-     */
-    readonly fetchImplementation: typeof fetch;
     /**
      * Cache expiration timestamp in epoch milliseconds.
      */
@@ -126,11 +122,6 @@ function readCachedFailedImportedAgentFallback(cacheKey: string): string_book |
         return null;
     }
 
-    if (cachedFallback.fetchImplementation !== globalThis.fetch) {
-        cachedFailedImportedAgentFallbackByKey.delete(cacheKey);
-        return null;
-    }
-
     return cachedFallback.fallbackSource;
 }
 
@@ -143,7 +134,6 @@ function readCachedFailedImportedAgentFallback(cacheKey: string): string_book |
 function writeCachedFailedImportedAgentFallback(cacheKey: string, fallbackSource: string_book): void {
     cachedFailedImportedAgentFallbackByKey.set(cacheKey, {
         fallbackSource,
-        fetchImplementation: globalThis.fetch,
         expiresAt: Date.now() + FAILED_IMPORTED_AGENT_FALLBACK_CACHE_TTL_MS,
     });
 }

package/apps/agents-server/src/utils/serverManagement/createManagedServer/bootstrapManagedServer.ts

@@ -47,7 +47,9 @@ export async function bootstrapManagedServer(input: NormalizedCreateServerInput)
         await applyManagedServerMigrations(client, input, sqlRecorder, migrationLogger);
         await seedServerUsers(client, input, sqlRecorder);
         await seedServerMetadata(client, input, sqlRecorder);
-        await seedServerDefaultAgents(client, input, sqlRecorder);
+        if (input.isDefaultAgentsInstalled) {
+            await seedServerDefaultAgents(client, input, sqlRecorder);
+        }
 
         await client.query('COMMIT');
         sqlRecorder.addStatement('COMMIT');

package/apps/agents-server/src/utils/serverManagement/createManagedServer/normalizeCreateServerInput.ts

@@ -51,6 +51,11 @@ export type NormalizedCreateServerInput = {
      * Initial metadata rows inserted during bootstrap.
      */
     readonly metadataEntries: ReadonlyArray<ServerMetadataSeedEntry>;
+
+    /**
+     * Whether bundled default agents from `agents/default` should be created during bootstrap.
+     */
+    readonly isDefaultAgentsInstalled: boolean;
 };
 
 /**
@@ -103,5 +108,6 @@ export function normalizeCreateServerInput(input: CreateServerInput): Normalized
             iconUrl,
             initialSettings: input.initialSettings,
         }),
+        isDefaultAgentsInstalled: input.isDefaultAgentsInstalled !== false,
     };
 }

package/apps/agents-server/src/utils/serverManagement/createManagedServer/seedServerDefaultAgents.ts

@@ -1,5 +1,6 @@
 import { createAgentPersistenceRecords } from '../../../../../../src/collection/agent-collection/constructors/agent-collection-in-supabase/createAgentPersistenceRecords';
 import type { Client } from 'pg';
+import { DEFAULT_AGENT_VISIBILITY } from '../../agentVisibility';
 import { loadDefaultAgentBooks } from '../../defaultAgents/loadDefaultAgentBooks';
 import { createInsertStatement, quoteIdentifier, type SqlRecorder } from './createSqlRecorder';
 import type { NormalizedCreateServerInput } from './normalizeCreateServerInput';
@@ -28,7 +29,7 @@ export async function seedServerDefaultAgents(
         const createdAt = new Date().toISOString();
         const { agentInsertRecord, agentHistoryInsertRecord } = createAgentPersistenceRecords(
             defaultAgentBook,
-            { sortOrder: index },
+            { sortOrder: index, visibility: DEFAULT_AGENT_VISIBILITY },
             createdAt,
         );
 
@@ -45,9 +46,10 @@ export async function seedServerDefaultAgents(
                     "promptbookEngineVersion",
                     "usage",
                     "folderId",
-                    "sortOrder"
+                    "sortOrder",
+                    "visibility"
                 )
-                VALUES ($1, $2, $3, $4, $5, $6, $7::jsonb, $8, $9::jsonb, $10, $11)
+                VALUES ($1, $2, $3, $4, $5, $6, $7::jsonb, $8, $9::jsonb, $10, $11, $12)
             `,
             [
                 agentInsertRecord.agentName,
@@ -61,6 +63,7 @@ export async function seedServerDefaultAgents(
                 JSON.stringify(agentInsertRecord.usage),
                 agentInsertRecord.folderId ?? null,
                 agentInsertRecord.sortOrder ?? index,
+                agentInsertRecord.visibility ?? DEFAULT_AGENT_VISIBILITY,
             ],
         );
         sqlRecorder.addStatement(
@@ -70,6 +73,7 @@ export async function seedServerDefaultAgents(
                 usage: JSON.stringify(agentInsertRecord.usage),
                 folderId: agentInsertRecord.folderId ?? null,
                 sortOrder: agentInsertRecord.sortOrder ?? index,
+                visibility: agentInsertRecord.visibility ?? DEFAULT_AGENT_VISIBILITY,
             }),
         );
 

package/apps/agents-server/src/utils/serverManagement/createManagedServer.ts

@@ -108,6 +108,11 @@ export type CreateServerInput = {
      */
     readonly additionalUsers?: ReadonlyArray<ServerSeedUserInput>;
 
+    /**
+     * Whether bundled default agents from `agents/default` should be created during bootstrap.
+     */
+    readonly isDefaultAgentsInstalled?: boolean;
+
     /**
      * Initial metadata values for the new server.
      */

package/apps/agents-server/src/utils/userChat/listUserChats.ts

@@ -1,5 +1,7 @@
 import { $getTableName } from '@/src/database/$getTableName';
 import { $provideClientSql } from '@/src/database/$provideClientSql';
+import { isAgentsServerSqliteMode } from '@/src/database/agentsServerDatabaseMode';
+import { $provideAgentsServerSqliteDatabase } from '@/src/database/sqlite/$provideAgentsServerSqliteDatabase';
 import type { ListUserChatsOptions, UserChatRecord } from './UserChatRecord';
 import type { UserChatSource } from './UserChatSource';
 import type { UserChatRow } from './UserChatRow';
@@ -30,6 +32,13 @@ const POSTGRES_UNDEFINED_COLUMN_ERROR_CODE = '42703';
 const CLIENT_SQL_MISSING_CONNECTION_MESSAGE_FRAGMENT =
     'Environment variable `POSTGRES_URL` or `DATABASE_URL` must be defined.';
 
+/**
+ * SQLite expression that safely exposes chat messages as a JSON array.
+ *
+ * @private function of `userChat`
+ */
+const SQLITE_CHAT_MESSAGES_JSON_EXPRESSION = `CASE WHEN json_valid(chat."messages") THEN chat."messages" ELSE '[]' END`;
+
 /**
  * Lists all user chats for one agent ordered by last activity.
  */
@@ -69,6 +78,10 @@ export async function listUserChats(options: ListUserChatsOptions): Promise<Arra
  * @private function of `userChat`
  */
 export async function listUserChatSummarySeeds(options: ListUserChatsOptions): Promise<Array<UserChatSummarySeed>> {
+    if (isAgentsServerSqliteMode()) {
+        return listUserChatSummarySeedsViaSqlite(options);
+    }
+
     if (!isDirectSqlConnectionConfigured()) {
         return listUserChatSummarySeedsViaSupabase(options);
     }
@@ -151,6 +164,92 @@ export async function listUserChatSummarySeeds(options: ListUserChatsOptions): P
     }
 }
 
+/**
+ * Lists lightweight chat-summary seeds through direct SQLite JSON queries.
+ *
+ * @private function of `userChat`
+ */
+async function listUserChatSummarySeedsViaSqlite(options: ListUserChatsOptions): Promise<Array<UserChatSummarySeed>> {
+    const userChatTableName = quoteIdentifier(await $getTableName('UserChat'));
+    const shouldLoadExternalChats = options.viewerIsAdmin && options.includeExternalChats;
+    const whereClause = shouldLoadExternalChats
+        ? `
+            chat."agentPermanentId" = ?
+            AND (chat."source" <> ? OR chat."userId" = ?)
+        `
+        : `
+            chat."userId" = ?
+            AND chat."agentPermanentId" = ?
+            AND chat."source" = ?
+        `;
+    const queryValues = shouldLoadExternalChats
+        ? [options.agentPermanentId, USER_CHAT_SOURCES.WEB_UI, options.userId]
+        : [options.userId, options.agentPermanentId, USER_CHAT_SOURCES.WEB_UI];
+
+    try {
+        const database = $provideAgentsServerSqliteDatabase();
+        const summaryRows = database
+            .prepare(
+                `
+                    SELECT
+                        chat."id",
+                        chat."createdAt",
+                        chat."updatedAt",
+                        chat."lastMessageAt",
+                        chat."title",
+                        chat."source",
+                        COALESCE(json_array_length(${SQLITE_CHAT_MESSAGES_JSON_EXPRESSION}), 0) AS "messagesCount",
+                        COALESCE(
+                            (
+                                SELECT CAST(json_extract(message.value, '$.content') AS TEXT)
+                                FROM json_each(${SQLITE_CHAT_MESSAGES_JSON_EXPRESSION}) AS message
+                                WHERE UPPER(CAST(COALESCE(json_extract(message.value, '$.sender'), '') AS TEXT)) = 'USER'
+                                ORDER BY CAST(message.key AS INTEGER) ASC
+                                LIMIT 1
+                            ),
+                            ''
+                        ) AS "firstUserMessageContent",
+                        COALESCE(
+                            (
+                                SELECT CAST(json_extract(message.value, '$.content') AS TEXT)
+                                FROM json_each(${SQLITE_CHAT_MESSAGES_JSON_EXPRESSION}) AS message
+                                WHERE LENGTH(TRIM(CAST(COALESCE(json_extract(message.value, '$.content'), '') AS TEXT))) > 0
+                                ORDER BY CAST(message.key AS INTEGER) DESC
+                                LIMIT 1
+                            ),
+                            ''
+                        ) AS "lastPreviewMessageContent",
+                        COALESCE(
+                            (
+                                SELECT COUNT(*)
+                                FROM json_each(${SQLITE_CHAT_MESSAGES_JSON_EXPRESSION}) AS message
+                                WHERE
+                                    UPPER(CAST(COALESCE(json_extract(message.value, '$.sender'), '') AS TEXT)) IN ('AGENT', 'MODEL')
+                                    AND (
+                                        json_extract(message.value, '$.isComplete') = 0
+                                        OR LOWER(CAST(COALESCE(json_extract(message.value, '$.isComplete'), '') AS TEXT)) = 'false'
+                                        OR LOWER(CAST(COALESCE(json_extract(message.value, '$.lifecycleState'), '') AS TEXT)) IN ('queued', 'running')
+                                    )
+                            ),
+                            0
+                        ) AS "pendingAssistantMessageCount"
+                    FROM ${userChatTableName} AS chat
+                    WHERE ${whereClause}
+                    ORDER BY chat."lastMessageAt" IS NULL ASC, chat."lastMessageAt" DESC, chat."updatedAt" DESC
+                `,
+            )
+            .all(...queryValues) as Array<UserChatSummarySeedSqlRow>;
+
+        return summaryRows.map(mapUserChatSummarySeedSqlRow);
+    } catch (error) {
+        if (!isUserChatSummarySeedSqliteFallbackError(error)) {
+            throw error;
+        }
+
+        return listUserChatSummarySeedsViaSupabase(options);
+    }
+}
+
 /**
  * Raw SQL row shape loaded for lightweight chat summary seeds.
  *
@@ -260,6 +359,16 @@ function isUserChatSummarySeedSqlFallbackError(error: unknown): boolean {
     return /relation .* does not exist|column .* does not exist/i.test(errorMessage);
 }
 
+/**
+ * Returns true when SQLite summary optimization should gracefully fallback to Supabase-shaped reads.
+ *
+ * @private function of `userChat`
+ */
+function isUserChatSummarySeedSqliteFallbackError(error: unknown): boolean {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    return /no such table|no such column|no such function: json_|malformed JSON/i.test(errorMessage);
+}
+
 /**
  * Loads chat-summary seeds using standard Supabase reads when SQL optimization is unavailable.
  *

package/apps/agents-server/src/utils/userChat.ts

@@ -13,7 +13,6 @@ export { getUserChat } from './userChat/getUserChat';
 export { getUserChatJob } from './userChat/getUserChatJob';
 export { getUserChatJobById } from './userChat/getUserChatJobById';
 export { getUserChatJobByClientMessageId } from './userChat/getUserChatJobByClientMessageId';
-export { getUserChatRevision } from './userChat/getUserChatRevision';
 export { heartbeatUserChatJob } from './userChat/heartbeatUserChatJob';
 export { listExpiredRunningUserChatJobs } from './userChat/listExpiredRunningUserChatJobs';
 export { listUserChats, listUserChatSummarySeeds } from './userChat/listUserChats';

package/esm/index.es.js

@@ -58,7 +58,7 @@ const BOOK_LANGUAGE_VERSION = '2.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.112.0-110';
+const PROMPTBOOK_ENGINE_VERSION = '0.112.0-112';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -34200,17 +34200,23 @@ function buildCodexScript(options) {
     var _a;
     const delimiter = resolveShellHereDocumentDelimiter(CODEX_PROMPT_DELIMITER, options.prompt);
     const projectPath = toPosixPath(options.projectPath);
-    const loginMethodConfig = options.allowCredits
-        ? 'CODEX_LOGIN_METHOD_ARGUMENTS=()'
-        : spaceTrim(`
-              CODEX_LOGIN_METHOD_ARGUMENTS=(-c forced_login_method=chatgpt)
-              if [ "\${PTBK_OPENAI_CODEX_USE_API_KEY:-0}" = "1" ] && [ -n "\${OPENAI_API_KEY:-}" ]; then
-                  CODEX_LOGIN_METHOD_ARGUMENTS=()
-              fi
-          `);
+    const loginMethodConfig = spaceTrim(`
+        ${options.allowCredits ? 'CODEX_LOGIN_METHOD_ARGUMENTS=()' : 'CODEX_LOGIN_METHOD_ARGUMENTS=(-c forced_login_method=chatgpt)'}
+        CODEX_USE_API_KEY="\${PTBK_OPENAI_CODEX_USE_API_KEY:-}"
+        if [ -z "\$CODEX_USE_API_KEY" ] && [ -n "\${OPENAI_API_KEY:-}" ]; then
+            CODEX_USE_API_KEY=1
+        fi
+        if [ "\$CODEX_USE_API_KEY" = "1" ] && [ -n "\${OPENAI_API_KEY:-}" ]; then
+            CODEX_LOGIN_METHOD_ARGUMENTS=(-c forced_login_method=api)
+        fi
+    `);
     const thinkingLevel = (_a = options.thinkingLevel) !== null && _a !== void 0 ? _a : DEFAULT_CODEX_THINKING_LEVEL;
     const lines = [
-        'if [ -f .env ]; then',
+        'if [ -n "${PTBK_AGENTS_SERVER_ENV_FILE:-}" ] && [ -f "${PTBK_AGENTS_SERVER_ENV_FILE}" ]; then',
+        'set -a',
+        'source "${PTBK_AGENTS_SERVER_ENV_FILE}"',
+        'set +a',
+        'elif [ -f .env ]; then',
         'set -a',
         'source .env',
         'set +a',
@@ -34218,7 +34224,7 @@ function buildCodexScript(options) {
         '',
         loginMethodConfig,
         '',
-        'if [ "${PTBK_OPENAI_CODEX_USE_API_KEY:-0}" != "1" ] || [ -z "${OPENAI_API_KEY:-}" ]; then',
+        'if [ "${CODEX_USE_API_KEY:-0}" != "1" ] || [ -z "${OPENAI_API_KEY:-}" ]; then',
         'unset OPENAI_API_KEY',
         'unset OPENAI_BASE_URL',
         'fi',
@@ -37272,6 +37278,12 @@ const PTBK_AGENTS_SERVER_SQLITE_PATH_ENV = 'PTBK_AGENTS_SERVER_SQLITE_PATH';
  * @private internal constant of `ptbk agents-server`
  */
 const PTBK_HOSTNAME_ENV = 'PTBK_HOSTNAME';
+/**
+ * Explicit installed `.env` file passed by standalone VPS pm2/runtime launchers.
+ *
+ * @private internal constant of `ptbk agents-server`
+ */
+const PTBK_AGENTS_SERVER_ENV_FILE_ENV = 'PTBK_AGENTS_SERVER_ENV_FILE';
 /**
  * Entropy size for the local-only token shared by the CLI pump and the Next app.
  *
@@ -37397,11 +37409,20 @@ async function prepareAgentsServerDevelopmentRuntime(appPath, runnerLogStream) {
     });
 }
 /**
- * Loads launch-directory `.env` values without overriding explicit process environment.
+ * Loads Agents Server runtime environment from the installed `.env` file when explicitly configured and falls back
+ * to the launch-directory `.env`.
  *
  * @private internal utility of `ptbk agents-server`
  */
 function loadAgentsServerProjectEnvironment(launchWorkingDirectory) {
+    var _a;
+    const explicitEnvFilePath = (_a = process.env[PTBK_AGENTS_SERVER_ENV_FILE_ENV]) === null || _a === void 0 ? void 0 : _a.trim();
+    if (explicitEnvFilePath) {
+        const explicitLoadResult = dotenv.config({ path: explicitEnvFilePath, override: true });
+        if (!explicitLoadResult.error) {
+            return;
+        }
+    }
     dotenv.config({ path: join(launchWorkingDirectory, AGENTS_SERVER_PROJECT_ENV_FILE_NAME) });
 }
 /**
@@ -37427,7 +37448,12 @@ function startNextServer(options) {
     var _a;
     const nextRuntimeModeLabel = describeAgentsServerNextRuntimeMode(options.options.nextRuntimeMode);
     logRunnerEvent(options.logStreams.runner, `Starting the Agents Server Next process in ${nextRuntimeModeLabel} mode.`);
-    const nextArguments = [options.nextCliPath, options.options.nextRuntimeMode, '--port', String(options.options.port)];
+    const nextArguments = [
+        options.nextCliPath,
+        options.options.nextRuntimeMode,
+        '--port',
+        String(options.options.port),
+    ];
     const hostname = (_a = options.childEnvironment[PTBK_HOSTNAME_ENV]) === null || _a === void 0 ? void 0 : _a.trim();
     if (hostname) {
         nextArguments.push('--hostname', hostname);