@promptbook/cli 0.112.0-110 → 0.112.0-111

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/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-111';
 /**
  * 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,19 @@ 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)'}
+        if [ "\${PTBK_OPENAI_CODEX_USE_API_KEY:-0}" = "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',
@@ -37427,7 +37429,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);