@promptbook/cli 0.114.0-0 → 0.114.0-10

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

@@ -12,12 +12,10 @@ export { fetchAgentUserTimeouts } from './userChatClient/fetchAgentUserTimeouts'
 export { fetchUserChat } from './userChatClient/fetchUserChat';
 export { fetchUserChats } from './userChatClient/fetchUserChats';
 export { removeUserChat } from './userChatClient/removeUserChat';
-export { runAgentUserTimeoutBulkAction } from './userChatClient/runAgentUserTimeoutBulkAction';
 export { saveUserChatDraft } from './userChatClient/saveUserChatDraft';
 export { saveUserChatMessages } from './userChatClient/saveUserChatMessages';
 export { sendUserChatMessage } from './userChatClient/sendUserChatMessage';
 export { streamUserChat } from './userChatClient/streamUserChat';
-export { updateAgentUserTimeout } from './userChatClient/updateAgentUserTimeout';
 export { UserChatApiError } from './userChatClient/UserChatApiError';
 
 /**
@@ -39,12 +37,21 @@ export type UserChatSummary = {
     updatedAt: string;
     lastMessageAt: string | null;
     source: UserChatSource;
+    /**
+     * Database user id owning the chat, used to link a super-admin to its owner.
+     */
+    userId?: number;
     isReadOnly: boolean;
     /**
      * True when the chat belongs to a different user than the current viewer
      * (visible only to admins/super-admins browsing external chats).
      */
     isExternalUserChat?: boolean;
+    /**
+     * True for the singleton goal chat the agent keeps with itself, which is pinned above
+     * every other chat and rendered with its own icon.
+     */
+    isAgentGoalChat?: boolean;
     messagesCount: number;
     title: string;
     preview: string;
@@ -134,35 +141,6 @@ export type AgentUserTimeoutListResponse = {
     generatedAt: string;
 };
 
-/**
- * Editable timeout fields accepted by the agent-wide timeout update endpoint.
- */
-export type AgentUserTimeoutUpdatePayload = {
-    dueAt?: string;
-    recurrenceIntervalMs?: number | null;
-    message?: string | null;
-    parameters?: Record<string, unknown>;
-    paused?: boolean;
-    extendByMs?: number;
-};
-
-/**
- * Supported bulk timeout actions in the agent-wide timeout manager.
- */
-export type AgentUserTimeoutBulkAction = 'cancel_all_active' | 'pause_all_active' | 'resume_all_paused';
-
-/**
- * API payload returned after one bulk timeout action.
- */
-export type AgentUserTimeoutBulkActionResponse = {
-    action: AgentUserTimeoutBulkAction;
-    matchedCount: number;
-    updatedCount: number;
-    timeoutIds: Array<string>;
-    hasMore: boolean;
-    generatedAt: string;
-};
-
 /**
  * API payload for list endpoint.
  */

package/apps/agents-server/src/utils/userChatTimeout/UserChatTimeoutRecord.ts

@@ -134,7 +134,11 @@ export type ListUserChatTimeoutsOptions = {
  * Query options for loading one timeout scoped only to user + agent.
  */
 export type GetAgentScopedUserChatTimeoutOptions = {
-    userId: number;
+    /**
+     * Owning user, or `undefined` to span every user of the agent
+     * (used by the agent goal chat, which plans on behalf of the agent itself).
+     */
+    userId?: number;
     agentPermanentId: string;
     timeoutId: string;
 };
@@ -143,7 +147,11 @@ export type GetAgentScopedUserChatTimeoutOptions = {
  * Query options for listing all timeouts owned by one user+agent across chats.
  */
 export type ListAgentUserChatTimeoutsOptions = {
-    userId: number;
+    /**
+     * Owning user, or `undefined` to span every user of the agent
+     * (used by the agent goal chat, which plans on behalf of the agent itself).
+     */
+    userId?: number;
     agentPermanentId: string;
     statuses?: ReadonlyArray<UserChatTimeoutStatus>;
     includePaused?: boolean;

package/apps/agents-server/src/utils/userChatTimeout/userChatTimeoutStore/claimNextDueUserChatTimeout.ts

@@ -1,3 +1,4 @@
+import { spaceTrim } from 'spacetrim';
 import { $provideClientSql } from '@/src/database/$provideClientSql';
 import { isAgentsServerSqliteMode } from '@/src/database/agentsServerDatabaseMode';
 import type { UserChatTimeoutRecord, UserChatTimeoutRow } from '../UserChatTimeoutRecord';
@@ -32,31 +33,33 @@ export async function claimNextDueUserChatTimeout(
 
     try {
         claimedRows = await sql.raw<Array<UserChatTimeoutRow>>(
-            `
-                WITH candidate AS (
-                    SELECT timeout."id"
-                    FROM ${tableIdentifier} timeout
-                    WHERE timeout."status" = 'QUEUED'
-                      AND timeout."cancelRequestedAt" IS NULL
-                      AND timeout."pausedAt" IS NULL
-                      AND timeout."dueAt" <= CURRENT_TIMESTAMP
-                      ${preferredTimeoutClause}
-                    ORDER BY timeout."dueAt" ASC, timeout."createdAt" ASC
-                    LIMIT 1
-                    FOR UPDATE SKIP LOCKED
-                )
-                UPDATE ${tableIdentifier} timeout
-                SET
-                    "status" = 'RUNNING',
-                    "updatedAt" = CURRENT_TIMESTAMP,
-                    "startedAt" = COALESCE(timeout."startedAt", CURRENT_TIMESTAMP),
-                    "leaseExpiresAt" = CURRENT_TIMESTAMP + ($1 * INTERVAL '1 millisecond'),
-                    "attemptCount" = timeout."attemptCount" + 1,
-                    "failureReason" = NULL
-                FROM candidate
-                WHERE timeout."id" = candidate."id"
-                RETURNING timeout.*
-            `,
+            spaceTrim(
+                (block) => `
+                    WITH candidate AS (
+                        SELECT timeout."id"
+                        FROM ${tableIdentifier} timeout
+                        WHERE timeout."status" = 'QUEUED'
+                          AND timeout."cancelRequestedAt" IS NULL
+                          AND timeout."pausedAt" IS NULL
+                          AND timeout."dueAt" <= CURRENT_TIMESTAMP
+                          ${block(preferredTimeoutClause)}
+                        ORDER BY timeout."dueAt" ASC, timeout."createdAt" ASC
+                        LIMIT 1
+                        FOR UPDATE SKIP LOCKED
+                    )
+                    UPDATE ${tableIdentifier} timeout
+                    SET
+                        "status" = 'RUNNING',
+                        "updatedAt" = CURRENT_TIMESTAMP,
+                        "startedAt" = COALESCE(timeout."startedAt", CURRENT_TIMESTAMP),
+                        "leaseExpiresAt" = CURRENT_TIMESTAMP + ($1 * INTERVAL '1 millisecond'),
+                        "attemptCount" = timeout."attemptCount" + 1,
+                        "failureReason" = NULL
+                    FROM candidate
+                    WHERE timeout."id" = candidate."id"
+                    RETURNING timeout.*
+                `,
+            ),
             values,
         );
     } catch (error) {

package/apps/agents-server/src/utils/userChatTimeout/userChatTimeoutStore/getAgentScopedUserChatTimeout.ts

@@ -16,12 +16,16 @@ export async function getAgentScopedUserChatTimeout(
     options: GetAgentScopedUserChatTimeoutOptions,
 ): Promise<UserChatTimeoutRecord | null> {
     const userChatTimeoutTable = await provideUserChatTimeoutTable();
-    const { data, error } = await userChatTimeoutTable
+    let query = userChatTimeoutTable
         .select('*')
         .eq('id', options.timeoutId)
-        .eq('userId', options.userId)
-        .eq('agentPermanentId', options.agentPermanentId)
-        .maybeSingle();
+        .eq('agentPermanentId', options.agentPermanentId);
+
+    if (typeof options.userId === 'number') {
+        query = query.eq('userId', options.userId);
+    }
+
+    const { data, error } = await query.maybeSingle();
 
     if (error) {
         if (isMissingUserChatTimeoutRelationError(error)) {

package/apps/agents-server/src/utils/userChatTimeout/userChatTimeoutStore/listAgentUserChatTimeouts.ts

@@ -14,11 +14,14 @@ export async function listAgentUserChatTimeouts(
     const userChatTimeoutTable = await provideUserChatTimeoutTable();
     let query = userChatTimeoutTable
         .select('*')
-        .eq('userId', options.userId)
         .eq('agentPermanentId', options.agentPermanentId)
         .order('updatedAt', { ascending: false })
         .order('createdAt', { ascending: false });
 
+    if (typeof options.userId === 'number') {
+        query = query.eq('userId', options.userId);
+    }
+
     if (options.statuses && options.statuses.length > 0) {
         query = query.in('status', options.statuses);
     }

package/apps/agents-server/src/utils/userChatTimeout/userChatTimeoutStore/recoverExpiredRunningUserChatTimeouts.ts

@@ -1,3 +1,4 @@
+import { spaceTrim } from 'spacetrim';
 import { $provideClientSql } from '@/src/database/$provideClientSql';
 import { isAgentsServerSqliteMode } from '@/src/database/agentsServerDatabaseMode';
 import { getUserChatTimeoutTableName } from './getUserChatTimeoutTableName';
@@ -21,7 +22,7 @@ export async function recoverExpiredRunningUserChatTimeouts(): Promise<number> {
 
     try {
         recoveredRows = await sql.raw<Array<{ id: string }>>(
-            `
+            spaceTrim(`
                 UPDATE ${tableIdentifier}
                 SET
                     "status" = CASE
@@ -46,7 +47,7 @@ export async function recoverExpiredRunningUserChatTimeouts(): Promise<number> {
                   AND "leaseExpiresAt" IS NOT NULL
                   AND "leaseExpiresAt" < CURRENT_TIMESTAMP
                 RETURNING "id"
-            `,
+            `),
         );
     } catch (error) {
         rethrowUnlessMissingUserChatTimeoutRelation(error);

package/apps/agents-server/src/utils/userChatTimeout/userChatTimeoutWorker.ts

@@ -2,6 +2,12 @@ import { LimitReachedError } from '@promptbook-local/core';
 import type { ChatMessage } from '@promptbook-local/types';
 import { serializeError, spaceTrim } from '@promptbook-local/utils';
 import { $randomBase58 } from '../../../../../src/utils/random/$randomBase58';
+import { appendAgentGoalChatNote } from '../agentGoalChat/appendAgentGoalChatNote';
+import { isAgentGoalChatId } from '../agentGoalChat/agentGoalChatIdentity';
+import {
+    createAgentGoalChatCancelledPlannedMessageNoteContent,
+    createAgentGoalChatPlannedMessageNoteContent,
+} from '../agentGoalChat/createAgentGoalChatNoteContent';
 import { getToolUsageLimits } from '../toolUsageLimits';
 import { resolveCurrentOrInternalServerOrigin } from '../resolveCurrentOrInternalServerOrigin';
 import { sendUserChatPushNotification } from '../sendUserChatPushNotification';
@@ -119,6 +125,7 @@ export async function scheduleThreadScopedUserChatTimeout(options: {
         durationMs: timeout.durationMs,
     });
 
+    await recordAgentGoalChatPlannedMessageNote(timeout);
     scheduleUserChatTimeoutLocalWakeup(timeout);
 
     return timeout;
@@ -130,6 +137,8 @@ export async function scheduleThreadScopedUserChatTimeout(options: {
  * @private internal utility of userChatTimeout
  */
 export async function cancelScheduledUserChatTimeout(timeoutId: string): Promise<UserChatTimeoutRecord | null> {
+    // Note: Cancelling an already-cancelled timeout is a no-op, and must not repeat its goal-chat note
+    const timeoutBeforeCancellation = await getUserChatTimeoutById(timeoutId);
     const cancelledTimeout = await cancelUserChatTimeout(timeoutId);
     clearUserChatTimeoutLocalWakeup(timeoutId);
 
@@ -140,11 +149,56 @@ export async function cancelScheduledUserChatTimeout(timeoutId: string): Promise
             status: cancelledTimeout.status,
             cancelRequestedAt: cancelledTimeout.cancelRequestedAt,
         });
+
+        if (!timeoutBeforeCancellation?.cancelRequestedAt) {
+            await recordAgentGoalChatCancelledPlannedMessageNote(cancelledTimeout);
+        }
     }
 
     return cancelledTimeout;
 }
 
+/**
+ * Mirrors one newly planned message into the goal chat of the owning agent.
+ *
+ * Planned messages can be created from any chat, but the agent's own thread is where all of them
+ * become visible, so the goal chat always shows the full plan.
+ *
+ * @private internal utility of userChatTimeout
+ */
+async function recordAgentGoalChatPlannedMessageNote(timeout: UserChatTimeoutRecord): Promise<void> {
+    await appendAgentGoalChatNote({
+        agentPermanentId: timeout.agentPermanentId,
+        content: createAgentGoalChatPlannedMessageNoteContent({
+            timeoutId: timeout.timeoutId,
+            dueAt: timeout.dueAt,
+            message: timeout.message,
+        }),
+    }).catch((error) => {
+        console.error('[user-chat-timeout]', 'goal_chat_planned_note_failed', {
+            timeoutId: timeout.timeoutId,
+            error: serializeError(error as Error),
+        });
+    });
+}
+
+/**
+ * Mirrors one cancelled planned message into the goal chat of the owning agent.
+ *
+ * @private internal utility of userChatTimeout
+ */
+async function recordAgentGoalChatCancelledPlannedMessageNote(timeout: UserChatTimeoutRecord): Promise<void> {
+    await appendAgentGoalChatNote({
+        agentPermanentId: timeout.agentPermanentId,
+        content: createAgentGoalChatCancelledPlannedMessageNoteContent({ timeoutId: timeout.timeoutId }),
+    }).catch((error) => {
+        console.error('[user-chat-timeout]', 'goal_chat_cancelled_note_failed', {
+            timeoutId: timeout.timeoutId,
+            error: serializeError(error as Error),
+        });
+    });
+}
+
 /**
  * Retained compatibility no-op for call sites that previously started a polling loop.
  *
@@ -297,6 +351,7 @@ async function processClaimedUserChatTimeout(timeout: UserChatTimeoutRecord): Pr
                         durationMs: latestTimeout.durationMs,
                         message: latestTimeout.message,
                     }),
+                    messageSender: isAgentGoalChatId(latestTimeout.chatId) ? 'AGENT' : 'USER',
                     parameters: latestTimeout.parameters,
                 });
                 queuedJob = enqueuedTurn.job;

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 {

package/apps/agents-server/tests/e2e/e2eEnvironment.cjs

@@ -0,0 +1,49 @@
+'use strict';
+
+/**
+ * Local host and port used by the mocked Supabase API during integration tests.
+ */
+const MOCK_SUPABASE_PORT = 54321;
+
+/**
+ * Base URL served by the mocked Supabase API.
+ */
+const MOCK_SUPABASE_URL = `http://127.0.0.1:${MOCK_SUPABASE_PORT}`;
+
+/**
+ * Local host and port used by the Agents Server application during integration tests.
+ */
+const APP_PORT = 4440;
+
+/**
+ * Base URL served by the Agents Server application during integration tests.
+ */
+const APP_URL = `http://127.0.0.1:${APP_PORT}`;
+
+/**
+ * Shared environment variables required by deterministic E2E builds and runs.
+ */
+const APP_E2E_ENV = Object.freeze({
+    ADMIN_PASSWORD: 'e2e-admin-password',
+    SESSION_SECRET: 'e2e-session-secret-must-differ-from-admin-password',
+    PTBK_AGENTS_SERVER_USER_CHAT_WORKER_TOKEN: 'e2e-user-chat-worker-token-must-differ-from-admin-password',
+    PROMPTBOOK_TEAM_AGENT_ACCESS_TOKEN: 'e2e-team-agent-access-token-must-differ-from-admin-password',
+    NEXT_DIST_DIR: '.next-e2e',
+    NEXT_PUBLIC_SITE_URL: APP_URL,
+    PTBK_AGENTS_SERVER_DATABASE: 'supabase',
+    PTBK_AGENTS_SERVER_SQLITE_PATH: '',
+    SUPABASE_TABLE_PREFIX: '',
+    POSTGRES_URL: '',
+    DATABASE_URL: '',
+    NEXT_PUBLIC_SUPABASE_URL: MOCK_SUPABASE_URL,
+    NEXT_PUBLIC_SUPABASE_ANON_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiJ9.e2e-signature',
+    SUPABASE_SERVICE_ROLE_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6InNlcnZpY2Vfcm9sZSJ9.e2e-signature',
+});
+
+module.exports = {
+    APP_E2E_ENV,
+    APP_PORT,
+    APP_URL,
+    MOCK_SUPABASE_PORT,
+    MOCK_SUPABASE_URL,
+};

package/esm/apps/agents-server/src/utils/agentGoalChat/agentGoalChatConstants.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Title stored on every agent goal chat.
+ */
+export declare const AGENT_GOAL_CHAT_TITLE = "Goal";
+/**
+ * Length of generated goal-chat message ids.
+ */
+export declare const AGENT_GOAL_CHAT_MESSAGE_ID_LENGTH = 14;
+/**
+ * Internal endpoint used by managed coding agents to plan goal-chat messages.
+ */
+export declare const AGENT_GOAL_CHAT_PLANNED_MESSAGES_INTERNAL_API_PATH = "/api/internal/agent-goal-chat-planned-messages";