@promptbook/cli 0.112.0-139 → 0.112.0-140

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

@@ -0,0 +1,59 @@
+import type { AgentsServerDatabase } from '../database/schema';
+
+/**
+ * Database row shape for the `User` table.
+ */
+type UserRow = AgentsServerDatabase['public']['Tables']['User']['Row'];
+
+/**
+ * Public user shape safe to send to browser UI.
+ *
+ * @private internal Agents Server API shape
+ */
+export type PublicUser = Pick<
+    UserRow,
+    'id' | 'username' | 'isAdmin' | 'createdAt' | 'updatedAt' | 'profileImageUrl'
+> & {
+    /**
+     * Email address from external authentication providers.
+     */
+    readonly email?: string | null;
+    /**
+     * Human-readable display name from external authentication providers.
+     */
+    readonly displayName?: string | null;
+    /**
+     * Authentication provider marker such as `LOCAL` or `SHIBBOLETH`.
+     */
+    readonly authenticationProvider?: string | null;
+};
+
+/**
+ * Supabase projection for user fields safe to return from UI-facing endpoints.
+ *
+ * @private internal Agents Server API projection
+ */
+export const PUBLIC_USER_SELECT_COLUMNS: string =
+    'id, username, isAdmin, createdAt, updatedAt, profileImageUrl, email, displayName, authenticationProvider';
+
+/**
+ * Maps a database user projection into the public user response shape.
+ *
+ * @param row - User projection loaded from the database.
+ * @returns User data safe to serialize to the browser.
+ *
+ * @private internal Agents Server API mapper
+ */
+export function toPublicUser(row: PublicUser): PublicUser {
+    return {
+        id: row.id,
+        username: row.username,
+        isAdmin: row.isAdmin,
+        createdAt: row.createdAt,
+        updatedAt: row.updatedAt,
+        profileImageUrl: row.profileImageUrl ?? null,
+        email: row.email ?? null,
+        displayName: row.displayName ?? null,
+        authenticationProvider: row.authenticationProvider ?? null,
+    };
+}

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

@@ -61,9 +61,12 @@ const SHIBBOLETH_AUTHENTICATION_PROVIDER = 'SHIBBOLETH';
 const LOCAL_AND_SHIBBOLETH_AUTHENTICATION_PROVIDER = 'LOCAL_AND_SHIBBOLETH';
 
 /**
- * User table row with Shibboleth profile columns added by migration.
+ * User table row fields needed while linking Shibboleth identities.
  */
-type UserRowWithShibbolethColumns = AgentsServerDatabase['public']['Tables']['User']['Row'] & {
+type UserRowWithShibbolethColumns = Pick<
+    AgentsServerDatabase['public']['Tables']['User']['Row'],
+    'id' | 'username' | 'isAdmin'
+> & {
     readonly email?: string | null;
     readonly displayName?: string | null;
     readonly authenticationProvider?: string | null;
@@ -87,6 +90,11 @@ type UserUpdateWithShibbolethColumns = AgentsServerDatabase['public']['Tables'][
     readonly authenticationProvider?: string | null;
 };
 
+/**
+ * Supabase projection for user fields needed while linking Shibboleth identities.
+ */
+const SHIBBOLETH_USER_SELECT_COLUMNS: string = 'id, username, isAdmin, email, displayName, authenticationProvider';
+
 /**
  * Prefixed Shibboleth identity row.
  *
@@ -791,7 +799,7 @@ async function findUserRowById(userId: number): Promise<UserRowWithShibbolethCol
     const supabase = $provideSupabaseForServer();
     const { data, error } = await supabase
         .from(await $getTableName('User'))
-        .select('*')
+        .select(SHIBBOLETH_USER_SELECT_COLUMNS)
         .eq('id', userId)
         .maybeSingle();
 
@@ -809,7 +817,7 @@ async function findUserRowByEmail(email: string): Promise<UserRowWithShibbolethC
     const supabase = $provideSupabaseForServer();
     const { data, error } = await supabase
         .from(await $getTableName('User'))
-        .select('*')
+        .select(SHIBBOLETH_USER_SELECT_COLUMNS)
         .eq('email' as never, email as never)
         .maybeSingle();
 
@@ -827,7 +835,7 @@ async function findUserRowByUsername(username: string): Promise<UserRowWithShibb
     const supabase = $provideSupabaseForServer();
     const { data, error } = await supabase
         .from(await $getTableName('User'))
-        .select('*')
+        .select(SHIBBOLETH_USER_SELECT_COLUMNS)
         .eq('username', username)
         .maybeSingle();
 
@@ -859,14 +867,14 @@ async function insertShibbolethUser(
     const { data, error } = await supabase
         .from(await $getTableName('User'))
         .insert(userInsert)
-        .select('*')
+        .select(SHIBBOLETH_USER_SELECT_COLUMNS)
         .single();
 
     if (error) {
         throw new Error(`Failed to create Shibboleth user: ${error.message}`);
     }
 
-    return data as UserRowWithShibbolethColumns;
+    return data as unknown as UserRowWithShibbolethColumns;
 }
 
 /**
@@ -892,14 +900,14 @@ async function updateLinkedShibbolethUser(
         .from(await $getTableName('User'))
         .update(userUpdate)
         .eq('id', user.id)
-        .select('*')
+        .select(SHIBBOLETH_USER_SELECT_COLUMNS)
         .single();
 
     if (error) {
         throw new Error(`Failed to update Shibboleth user: ${error.message}`);
     }
 
-    return data as UserRowWithShibbolethColumns;
+    return data as unknown as UserRowWithShibbolethColumns;
 }
 
 /**

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

@@ -2,6 +2,7 @@ import { prepareToolCallsForStreaming } from '@/src/utils/toolCallStreaming';
 import type { ChatMessage, LlmToolDefinition, ToolCall } from '@promptbook-local/types';
 import type { ChatPromptResult } from '../../../../../src/execution/PromptResult';
 import { mergeToolCalls } from '../../../../../src/utils/toolCalls/mergeToolCalls';
+import { createUserChatHarnessProgressCard } from './createUserChatHarnessProgressCard';
 import { persistUserChatJobTerminalState } from './persistUserChatJobTerminalState';
 import { updateUserChatAssistantMessage } from './updateUserChatAssistantMessage';
 import { USER_CHAT_JOB_ASSISTANT_MESSAGE_PERSIST_INTERVAL_MS } from './userChatJobRuntimeConstants';
@@ -125,17 +126,22 @@ export function createRunUserChatJobPersistenceController(options: {
         }
 
         queueAssistantMessageUpdate(
-            (message) => ({
-                ...message,
-                content: latestContent,
-                ongoingToolCalls: latestToolCalls,
-                lifecycleState: 'running',
-                lifecycleError: undefined,
-                isComplete: false,
-                prompt: options.createPromptSnapshot({
-                    toolCalls: latestToolCalls,
-                }),
-            }),
+            (message) => {
+                const harnessProgressCard = createUserChatHarnessProgressCard(latestToolCalls);
+
+                return {
+                    ...message,
+                    content: latestContent,
+                    ongoingToolCalls: latestToolCalls,
+                    lifecycleState: 'running',
+                    lifecycleError: undefined,
+                    isComplete: false,
+                    progressCard: harnessProgressCard ?? message.progressCard,
+                    prompt: options.createPromptSnapshot({
+                        toolCalls: latestToolCalls,
+                    }),
+                };
+            },
             {
                 snapshotSignature,
             },

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

@@ -0,0 +1,99 @@
+import type { ChatMessage, ToolCall } from '@promptbook-local/types';
+import { spaceTrim } from '../../../../../src/_packages/utils.index';
+import { TOOL_TITLES } from '../../../../../src/book-components/Chat/utils/getToolCallChipletInfo';
+import { isVisibleChatToolCall } from '../../../../../src/book-components/Chat/utils/isVisibleChatToolCall';
+import { resolveToolCallState } from '../../../../../src/book-components/Chat/utils/resolveToolCallState';
+
+/**
+ * Default title used while a running chat job reports harness action progress.
+ */
+const USER_CHAT_HARNESS_PROGRESS_TITLE = 'Working on your request';
+
+/**
+ * Creates a user-facing progress card from the latest visible harness/tool action.
+ *
+ * @param toolCalls - Latest aggregated tool-call snapshots emitted by the agent runtime.
+ * @returns Progress card for the latest visible action, or null when there is no user-facing action yet.
+ */
+export function createUserChatHarnessProgressCard(
+    toolCalls: ReadonlyArray<ToolCall> | undefined,
+): NonNullable<ChatMessage['progressCard']> | null {
+    const latestVisibleToolCall = resolveLatestVisibleToolCall(toolCalls);
+    if (!latestVisibleToolCall) {
+        return null;
+    }
+
+    return {
+        title: USER_CHAT_HARNESS_PROGRESS_TITLE,
+        now: createHarnessProgressNowText(latestVisibleToolCall),
+        items: [],
+        updatedAt: new Date().toISOString() as NonNullable<ChatMessage['progressCard']>['updatedAt'],
+        isVisible: true,
+    };
+}
+
+/**
+ * Resolves the latest user-facing tool call from an aggregated runtime snapshot.
+ *
+ * @private internal helper of `createUserChatHarnessProgressCard`
+ */
+function resolveLatestVisibleToolCall(toolCalls: ReadonlyArray<ToolCall> | undefined): ToolCall | null {
+    if (!toolCalls || toolCalls.length === 0) {
+        return null;
+    }
+
+    for (let index = toolCalls.length - 1; index >= 0; index--) {
+        const toolCall = toolCalls[index]!;
+        if (isVisibleChatToolCall(toolCall)) {
+            return toolCall;
+        }
+    }
+
+    return null;
+}
+
+/**
+ * Creates the current-action text shown in the progress card.
+ *
+ * @private internal helper of `createUserChatHarnessProgressCard`
+ */
+function createHarnessProgressNowText(toolCall: ToolCall): string {
+    const actionLabel = resolveToolCallActionLabel(toolCall);
+    const toolCallState = resolveToolCallState(toolCall);
+
+    switch (toolCallState) {
+        case 'COMPLETE':
+            return spaceTrim(`
+                Action completed: ${actionLabel}.
+            `);
+        case 'ERROR':
+            return spaceTrim(`
+                Action failed: ${actionLabel}.
+            `);
+        case 'PENDING':
+        case 'PARTIAL':
+        default:
+            return spaceTrim(`
+                Running action: ${actionLabel}.
+            `);
+    }
+}
+
+/**
+ * Resolves a concise user-facing action label from one technical tool call name.
+ *
+ * @private internal helper of `createUserChatHarnessProgressCard`
+ */
+function resolveToolCallActionLabel(toolCall: ToolCall): string {
+    const knownTitle = TOOL_TITLES[toolCall.name]?.title;
+    if (knownTitle) {
+        return knownTitle;
+    }
+
+    const normalizedName = toolCall.name
+        .trim()
+        .replace(/[_-]+/g, ' ')
+        .replace(/\s+/g, ' ');
+
+    return normalizedName || 'agent action';
+}

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

@@ -0,0 +1,63 @@
+import type { ChatMessage } from '@promptbook-local/types';
+import { spaceTrim } from '../../../../../src/_packages/utils.index';
+
+/**
+ * Runner types that can own durable chat work outside the browser request.
+ */
+export type UserChatRunnerKind = 'local' | 'external';
+
+/**
+ * Runner progress phases visible before a final answer is available.
+ */
+export type UserChatRunnerProgressPhase = 'queued_for_runner';
+
+/**
+ * Default title used while an out-of-process runner is working on a chat answer.
+ */
+const USER_CHAT_RUNNER_PROGRESS_TITLE = 'Working on your request';
+
+/**
+ * User-facing labels for durable chat runners.
+ */
+const USER_CHAT_RUNNER_LABELS: Record<UserChatRunnerKind, string> = {
+    local: 'local agent runner',
+    external: 'external agent runner',
+};
+
+/**
+ * Creates a progress card for the observable state of an out-of-process chat runner.
+ *
+ * @param options - Runner kind and current progress phase.
+ * @returns Progress card with one concise real runner state.
+ */
+export function createUserChatRunnerProgressCard(options: {
+    readonly runnerKind: UserChatRunnerKind;
+    readonly phase: UserChatRunnerProgressPhase;
+}): NonNullable<ChatMessage['progressCard']> {
+    return {
+        title: USER_CHAT_RUNNER_PROGRESS_TITLE,
+        now: createUserChatRunnerProgressNowText(options),
+        items: [],
+        updatedAt: new Date().toISOString() as NonNullable<ChatMessage['progressCard']>['updatedAt'],
+        isVisible: true,
+    };
+}
+
+/**
+ * Creates the current runner-state text shown in the progress card.
+ *
+ * @private internal helper of `createUserChatRunnerProgressCard`
+ */
+function createUserChatRunnerProgressNowText(options: {
+    readonly runnerKind: UserChatRunnerKind;
+    readonly phase: UserChatRunnerProgressPhase;
+}): string {
+    const runnerLabel = USER_CHAT_RUNNER_LABELS[options.runnerKind];
+
+    switch (options.phase) {
+        case 'queued_for_runner':
+            return spaceTrim(`
+                The ${runnerLabel} has the request and is working on the answer.
+            `);
+    }
+}

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

@@ -1,6 +1,4 @@
 import type { ChatMessage } from '../../../../../src/_packages/types.index';
-import { createUserChatProgressCard } from './userChatProgressCard';
-
 /**
  * Lifecycle states rendered on canonical server-owned chat messages.
  */
@@ -46,7 +44,6 @@ export function createQueuedUserChatAssistantMessage(options: {
         isComplete: false,
         lifecycleState: 'queued',
         jobId: options.jobId,
-        progressCard: createUserChatProgressCard('queued'),
     };
 }
 

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

@@ -25,6 +25,9 @@ export const VPS_ENVIRONMENT_VARIABLE_KEYS = [
     'SESSION_SECRET',
     'PTBK_AGENTS_SERVER_USER_CHAT_WORKER_TOKEN',
     'PROMPTBOOK_TEAM_AGENT_ACCESS_TOKEN',
+    'SENDGRID_INBOUND_PARSE_PUBLIC_KEY',
+    'SENDGRID_INBOUND_PARSE_WEBHOOK_SECRET',
+    'SENDGRID_INBOUND_PARSE_HOSTS',
     'OPENAI_API_KEY',
     'PTBK_HARNESS',
     'PTBK_MODEL',

package/esm/index.es.js

@@ -59,7 +59,7 @@ const BOOK_LANGUAGE_VERSION = '2.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.112.0-139';
+const PROMPTBOOK_ENGINE_VERSION = '0.112.0-140';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -28825,6 +28825,18 @@ async function runScriptUntilMarkerIdle(options) {
                 settleOnce(handler);
             });
         };
+        /**
+         * Finishes a marker-completed run and then asks bash to stop.
+         */
+        const finishAfterIdleTimeout = () => {
+            settleWithLog('completed after idle timeout', () => resolve(fullOutput));
+            try {
+                commandProcess.kill();
+            }
+            catch (_a) {
+                // Windows can report EPERM when bash exits before the idle timer fires.
+            }
+        };
         /**
          * Resets the idle timer that triggers termination after inactivity.
          */
@@ -28832,10 +28844,7 @@ async function runScriptUntilMarkerIdle(options) {
             if (idleTimer) {
                 clearTimeout(idleTimer);
             }
-            idleTimer = setTimeout(() => {
-                commandProcess.kill();
-                settleWithLog('completed after idle timeout', () => resolve(fullOutput));
-            }, idleTimeoutMs);
+            idleTimer = setTimeout(finishAfterIdleTimeout, idleTimeoutMs);
         };
         /**
          * Processes completed output lines to detect completion markers.