@promptbook/cli 0.114.0-3 → 0.114.0-4

package/apps/agents-server/src/utils/handleChatCompletion/createHandleChatCompletionPromptContext.ts

@@ -64,7 +64,6 @@ export async function createHandleChatCompletionPromptContext(options: {
         projectRepositories: runtime.projectRepositories,
         projectGithubToken: runtime.projectGithubToken,
         emailSmtpCredential: runtime.emailSmtpCredential,
-        emailFromAddress: runtime.useEmailConfiguration.senderEmail,
         calendarGoogleAccessToken: runtime.calendarGoogleAccessToken,
         calendarConnections: runtime.calendarConnections,
         localServerUrl: runtime.localServerUrl,

package/apps/agents-server/src/utils/handleChatCompletion/resolveHandleChatCompletionRuntime.ts

@@ -5,7 +5,6 @@ import type { string_book, TODO_any } from '@promptbook-local/types';
 import { createInlineKnowledgeSourceUploader } from '@/src/utils/knowledge/createInlineKnowledgeSourceUploader';
 import { resolveCurrentUserMemoryIdentity } from '@/src/utils/userMemory';
 import { extractUseCalendarConnectionsFromAgentSource } from '@/src/utils/calendars/extractUseCalendarConnectionsFromAgentSource';
-import { extractUseEmailConfigurationFromAgentSource } from '@/src/utils/emails/extractUseEmailConfigurationFromAgentSource';
 import { extractProjectRepositoriesFromAgentSource } from '@/src/utils/projects/extractProjectRepositoriesFromAgentSource';
 import { resolveUseEmailSmtpCredential } from '@/src/utils/resolveUseEmailSmtpCredential';
 import { resolveUseCalendarGoogleToken } from '@/src/utils/resolveUseCalendarGoogleToken';
@@ -43,7 +42,6 @@ export type HandleChatCompletionRuntime = {
     agentHash: string;
     projectRepositories: ReturnType<typeof extractProjectRepositoriesFromAgentSource>;
     calendarConnections: ReturnType<typeof extractUseCalendarConnectionsFromAgentSource>;
-    useEmailConfiguration: ReturnType<typeof extractUseEmailConfigurationFromAgentSource>;
     currentUserIdentity: Awaited<ReturnType<typeof resolveCurrentUserMemoryIdentity>>;
     projectGithubToken: Awaited<ReturnType<typeof resolveUseProjectGithubToken>>;
     calendarGoogleAccessToken: Awaited<ReturnType<typeof resolveUseCalendarGoogleToken>>;
@@ -95,7 +93,6 @@ export async function resolveHandleChatCompletionRuntime(options: {
     const unresolvedAgentSource = resolvedAgentContext.unresolvedAgentSource;
     const projectRepositories = extractProjectRepositoriesFromAgentSource(agentSource);
     const calendarConnections = extractUseCalendarConnectionsFromAgentSource(agentSource);
-    const useEmailConfiguration = extractUseEmailConfigurationFromAgentSource(agentSource);
     const messageSuffix = resolveMessageSuffixFromAgentSource(agentSource);
     const { agentSourceWithContext, hasDynamicContext } = appendSystemMessagesToAgentSource(agentSource, messages);
     agentSource = agentSourceWithContext;
@@ -121,7 +118,6 @@ export async function resolveHandleChatCompletionRuntime(options: {
             currentUserIdentity,
             agentId,
             calendarConnections,
-            useEmailConfiguration,
         });
     const agent = await createHandleChatCompletionAgent({
         agentName,
@@ -145,7 +141,6 @@ export async function resolveHandleChatCompletionRuntime(options: {
         agentHash,
         projectRepositories,
         calendarConnections,
-        useEmailConfiguration,
         currentUserIdentity,
         projectGithubToken,
         calendarGoogleAccessToken,
@@ -213,7 +208,6 @@ async function resolveHandleChatCompletionCredentials(options: {
     currentUserIdentity: Awaited<ReturnType<typeof resolveCurrentUserMemoryIdentity>>;
     agentId: string;
     calendarConnections: ReturnType<typeof extractUseCalendarConnectionsFromAgentSource>;
-    useEmailConfiguration: ReturnType<typeof extractUseEmailConfigurationFromAgentSource>;
 }): Promise<{
     projectGithubToken: Awaited<ReturnType<typeof resolveUseProjectGithubToken>>;
     calendarGoogleAccessToken: Awaited<ReturnType<typeof resolveUseCalendarGoogleToken>>;
@@ -231,12 +225,10 @@ async function resolveHandleChatCompletionCredentials(options: {
                   agentPermanentId: options.agentId,
               })
             : Promise.resolve(undefined),
-        options.useEmailConfiguration.isEnabled
-            ? resolveUseEmailSmtpCredential({
-                  userId,
-                  agentPermanentId: options.agentId,
-              })
-            : Promise.resolve(undefined),
+        resolveUseEmailSmtpCredential({
+            userId,
+            agentPermanentId: options.agentId,
+        }),
     ]);
 
     return {

package/apps/agents-server/src/utils/manGoOnboarding/manGoOnboardingAgentBooks.ts

@@ -23,7 +23,6 @@ export const MAN_GO_BOOK_EXPERT_BOOK = spaceTrim(`
     PERSONA You are a company lawyer.
     Your job is to provide legal advice and support to the company and its employees.
     You are knowledgeable, professional, and detail-oriented.
-    USE SEARCH ENGINE
     \`\`\`
 
     RULE You are writing a book in the language the user will ask you.

package/apps/agents-server/src/utils/messages/parseUseEmailSmtpCredential.ts

@@ -2,7 +2,7 @@ import { isValidEmail } from '../../../../../src/utils/validators/email/isValidE
 import type { SmtpMessageProviderConfiguration } from '../../message-providers/email/smtp/SmtpMessageProvider';
 
 /**
- * Normalized SMTP credential payload expected in wallet secret for USE EMAIL.
+ * Normalized SMTP credential payload expected in wallet secret for agent email.
  */
 export type UseEmailSmtpCredential = SmtpMessageProviderConfiguration & {
     fromAddress?: string;

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

@@ -4,7 +4,7 @@ import {
 } from './userWallet';
 
 /**
- * Resolves SMTP credential payload for USE EMAIL from wallet records.
+ * Resolves SMTP credential payload for agent email from wallet records.
  */
 export async function resolveUseEmailSmtpCredential(
     options: ResolveUseEmailSmtpCredentialOptions,

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

@@ -1,17 +1,17 @@
 import { spaceTrim } from 'spacetrim';
 
 /**
- * Wallet service id used by USE EMAIL for SMTP credentials.
+ * Wallet service id used by agent email for SMTP credentials.
  */
 export const USE_EMAIL_SMTP_WALLET_SERVICE = 'smtp';
 
 /**
- * Wallet key used by USE EMAIL for SMTP credentials.
+ * Wallet key used by agent email for SMTP credentials.
  */
 export const USE_EMAIL_SMTP_WALLET_KEY = 'use-email-smtp-credentials';
 
 /**
- * JSON schema expected in ACCESS_TOKEN secret for USE EMAIL SMTP credentials.
+ * JSON schema expected in ACCESS_TOKEN secret for agent email SMTP credentials.
  */
 export const USE_EMAIL_SMTP_WALLET_SECRET_JSON_SCHEMA = {
     type: 'object',
@@ -49,7 +49,7 @@ export const USE_EMAIL_SMTP_WALLET_SECRET_JSON_SCHEMA = {
 } as const;
 
 /**
- * Multiline JSON example for USE EMAIL SMTP secret payload.
+ * Multiline JSON example for agent email SMTP secret payload.
  */
 export const USE_EMAIL_SMTP_WALLET_SECRET_JSON_EXAMPLE = spaceTrim(`
     {
@@ -62,7 +62,7 @@ export const USE_EMAIL_SMTP_WALLET_SECRET_JSON_EXAMPLE = spaceTrim(`
 `);
 
 /**
- * Builds user-facing guidance for missing USE EMAIL SMTP wallet credentials.
+ * Builds user-facing guidance for missing agent email SMTP wallet credentials.
  */
 export function createUseEmailSmtpWalletMissingCredentialMessage(defaultFromAddress?: string): string {
     const defaultSenderLine = defaultFromAddress ? `Default sender from commitment: ${defaultFromAddress}` : undefined;

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

@@ -14,7 +14,6 @@ import {
     resolveCachedServerAgentModelRequirements,
 } from '@/src/utils/cachedServerAgentRuntime';
 import { extractUseCalendarConnectionsFromAgentSource } from '@/src/utils/calendars/extractUseCalendarConnectionsFromAgentSource';
-import { extractUseEmailConfigurationFromAgentSource } from '@/src/utils/emails/extractUseEmailConfigurationFromAgentSource';
 import { getTeacherRemoteAgent } from '@/src/utils/getTeacherRemoteAgent';
 import { composePromptParametersWithMemoryContext } from '@/src/utils/memoryRuntimeContext';
 import { extractProjectRepositoriesFromAgentSource } from '@/src/utils/projects/extractProjectRepositoriesFromAgentSource';
@@ -112,7 +111,6 @@ export async function createRunUserChatJobExecutionContext(options: {
     const resolvedAgentName = resolvedAgentContext.resolvedAgentName;
     const projectRepositories = extractProjectRepositoriesFromAgentSource(agentSource);
     const calendarConnections = extractUseCalendarConnectionsFromAgentSource(agentSource);
-    const useEmailConfiguration = extractUseEmailConfigurationFromAgentSource(agentSource);
     const agentToolDefinitions = preparedAgentModelRequirements.modelRequirements.tools ?? [];
     const agentKnowledgeSources = preparedAgentModelRequirements.modelRequirements.knowledgeSources ?? [];
 
@@ -124,7 +122,7 @@ export async function createRunUserChatJobExecutionContext(options: {
         toolCount: agentToolDefinitions.length,
         toolHighlights: resolveUserChatProgressToolHighlights(agentToolDefinitions),
         hasCalendarAccess: calendarConnections.length > 0,
-        hasEmailAccess: useEmailConfiguration.isEnabled,
+        hasEmailAccess: true,
         hasProjectAccess: projectRepositories.length > 0,
     };
 
@@ -135,7 +133,6 @@ export async function createRunUserChatJobExecutionContext(options: {
             userId: options.job.userId,
             agentPermanentId,
             calendarConnections,
-            isEmailEnabled: useEmailConfiguration.isEnabled,
         });
     const runtimeTools = createAgentProgressTools(
         createChatAttachmentTools([], options.userMessageAttachments || []),
@@ -164,7 +161,6 @@ export async function createRunUserChatJobExecutionContext(options: {
         projectRepositories,
         projectGithubToken,
         emailSmtpCredential,
-        emailFromAddress: useEmailConfiguration.senderEmail,
         calendarGoogleAccessToken,
         calendarConnections,
         chatAttachments: options.userMessageAttachments,
@@ -255,7 +251,6 @@ async function resolveRunUserChatJobCredentials(options: {
     userId: number;
     agentPermanentId: string;
     calendarConnections: ReturnType<typeof extractUseCalendarConnectionsFromAgentSource>;
-    isEmailEnabled: boolean;
 }) {
     const [projectGithubToken, calendarGoogleAccessToken, emailSmtpCredential] = await Promise.all([
         resolveUseProjectGithubToken({
@@ -268,12 +263,10 @@ async function resolveRunUserChatJobCredentials(options: {
                   agentPermanentId: options.agentPermanentId,
               })
             : Promise.resolve(undefined),
-        options.isEmailEnabled
-            ? resolveUseEmailSmtpCredential({
-                  userId: options.userId,
-                  agentPermanentId: options.agentPermanentId,
-              })
-            : Promise.resolve(undefined),
+        resolveUseEmailSmtpCredential({
+            userId: options.userId,
+            agentPermanentId: options.agentPermanentId,
+        }),
     ]);
 
     return {

package/apps/agents-server/src/utils/userWallet/UserWalletRecord.ts

@@ -97,7 +97,7 @@ export type ResolveUseProjectGithubTokenOptions = {
 };
 
 /**
- * SMTP credential resolution options for USE EMAIL.
+ * SMTP credential resolution options for agent email.
  */
 export type ResolveUseEmailSmtpCredentialOptions = {
     userId?: number;

package/apps/agents-server/src/utils/userWallet/resolveUseEmailSmtpCredentialFromWallet.ts

@@ -3,7 +3,7 @@ import type { ResolveUseEmailSmtpCredentialOptions } from './UserWalletRecord';
 import { resolveWalletAccessTokenFromScopes } from './resolveWalletAccessTokenFromScopes';
 
 /**
- * Resolves SMTP credential payload for USE EMAIL from wallet using scope priority:
+ * Resolves SMTP credential payload for agent email from wallet using scope priority:
  * user+agent -> agent-only -> user-only -> server-global.
  */
 export async function resolveUseEmailSmtpCredentialFromWallet(

package/apps/agents-server/src/utils/vpsSelfUpdate/deleteVpsSelfUpdateInstalledVersion.ts

@@ -2,6 +2,7 @@ import { rm, stat } from 'fs/promises';
 import { resolve } from 'path';
 import { spaceTrim } from 'spacetrim';
 import { NotAllowed } from '../../../../../src/errors/NotAllowed';
+import { isVpsSelfUpdateJobRunning } from './isVpsSelfUpdateJobRunning';
 import { readPersistedVpsSelfUpdateJob } from './readPersistedVpsSelfUpdateJob';
 import { resolveManagedPromptbookRepositoryDirectory } from './vpsSelfUpdateConfiguration';
 import { resolveVpsSelfUpdateReleasesDirectory } from './vpsSelfUpdateInstalledVersions';
@@ -37,7 +38,7 @@ export async function deleteVpsSelfUpdateInstalledVersion(versionName: string):
     }
 
     const currentJob = await readPersistedVpsSelfUpdateJob({ isLogTailIncluded: false });
-    if (currentJob.status === 'running' && !currentJob.isStale) {
+    if (isVpsSelfUpdateJobRunning(currentJob)) {
         throw new NotAllowed(
             spaceTrim(`
                 Installed versions cannot be deleted while a standalone VPS self-update is running.

package/apps/agents-server/src/utils/vpsSelfUpdate/isVpsSelfUpdateJobRunning.ts

@@ -0,0 +1,16 @@
+import type { VpsSelfUpdateJobSnapshot } from './vpsSelfUpdateTypes';
+
+/**
+ * Checks whether one persisted self-update job is really running right now.
+ *
+ * A job whose installer process disappeared without writing a terminal status still claims to be
+ * running in the status file, so the stale flag has to be taken into account together with the status.
+ *
+ * @param job - Persisted self-update job snapshot.
+ * @returns `true` when a standalone VPS self-update is in progress.
+ *
+ * @private function of `vpsSelfUpdate`
+ */
+export function isVpsSelfUpdateJobRunning(job: VpsSelfUpdateJobSnapshot): boolean {
+    return job.status === 'running' && !job.isStale;
+}

package/apps/agents-server/src/utils/vpsSelfUpdate/startVpsSelfUpdate.ts

@@ -4,6 +4,7 @@ import { dirname } from 'path';
 import { NotAllowed } from '../../../../../src/errors/NotAllowed';
 import { spaceTrim } from 'spacetrim';
 import { createVpsInstallerCommandEnvironment, resolveVpsInstallerScriptPath } from '../vpsConfiguration';
+import { isVpsSelfUpdateJobRunning } from './isVpsSelfUpdateJobRunning';
 import { resolveVpsSelfUpdateEnvironment } from './vpsSelfUpdateEnvironment';
 import {
     normalizeVpsSelfUpdateOriginRepositoryUrl,
@@ -66,7 +67,7 @@ export async function startVpsSelfUpdate(request: VpsSelfUpdateStartRequest): Pr
     const originRepositoryUrl = requestedOriginUrl || (await readConfiguredVpsSelfUpdateOriginRepositoryUrl());
 
     const currentJob = await readPersistedVpsSelfUpdateJob({ isLogTailIncluded: false });
-    if (currentJob.status === 'running' && !currentJob.isStale) {
+    if (isVpsSelfUpdateJobRunning(currentJob)) {
         throw new NotAllowed(
             spaceTrim(`
                 A standalone VPS self-update is already running.

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

@@ -4,6 +4,7 @@
 //       remain split across small, single-responsibility modules.
 
 export { deleteVpsSelfUpdateInstalledVersion } from './vpsSelfUpdate/deleteVpsSelfUpdateInstalledVersion';
+export { isVpsSelfUpdateJobRunning } from './vpsSelfUpdate/isVpsSelfUpdateJobRunning';
 export { listVpsSelfUpdateCandidateCommits } from './vpsSelfUpdate/listVpsSelfUpdateCandidateCommits';
 export { readVpsSelfUpdateJobSnapshot } from './vpsSelfUpdate/readPersistedVpsSelfUpdateJob';
 export {