From 08e76edd517a9ebc36a93d6a35b9df3bf99f91af Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Wed, 20 Aug 2025 00:54:11 +0530
Subject: [PATCH 01/15] remove user-facing errors

---
 .../app/api/copilot-stream-response/[streamId]/route.ts   | 2 +-
 apps/rowboat/app/api/stream-response/[streamId]/route.ts  | 2 +-
 apps/rowboat/app/api/v1/[projectId]/chat/route.ts         | 2 +-
 apps/rowboat/app/scripts/rag-worker.ts                    | 4 ++--
 .../src/application/lib/agents-runtime/agent-tools.ts     | 8 ++++----
 apps/rowboat/src/application/workers/jobs.worker.ts       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/rowboat/app/api/copilot-stream-response/[streamId]/route.ts b/apps/rowboat/app/api/copilot-stream-response/[streamId]/route.ts
index 3b743a3a..1e540933 100644
--- a/apps/rowboat/app/api/copilot-stream-response/[streamId]/route.ts
+++ b/apps/rowboat/app/api/copilot-stream-response/[streamId]/route.ts
@@ -53,7 +53,7 @@ export async function GET(request: Request, props: { params: Promise<{ streamId:
         }
       } catch (error) {
         console.error('Error processing copilot stream:', error);
-        controller.error(error);
+        controller.error(new Error("Something went wrong. Please try again."));
       } finally {
         // log copilot usage
         if (USE_BILLING && billingCustomerId) {
diff --git a/apps/rowboat/app/api/stream-response/[streamId]/route.ts b/apps/rowboat/app/api/stream-response/[streamId]/route.ts
index 4fc9de3f..17c1a8d8 100644
--- a/apps/rowboat/app/api/stream-response/[streamId]/route.ts
+++ b/apps/rowboat/app/api/stream-response/[streamId]/route.ts
@@ -31,7 +31,7 @@ export async function GET(request: Request, props: { params: Promise<{ streamId:
                 console.error('Error processing stream:', error);
                 const errMessage: z.infer<typeof TurnEvent> = {
                     type: "error",
-                    error: `Error processing stream: ${error}`,
+                    error: "Something went wrong. Please try again.",
                     isBillingError: false,
                 };
                 controller.enqueue(encoder.encode(`event: message\ndata: ${JSON.stringify(errMessage)}\n\n`));
diff --git a/apps/rowboat/app/api/v1/[projectId]/chat/route.ts b/apps/rowboat/app/api/v1/[projectId]/chat/route.ts
index 73a48348..95234692 100644
--- a/apps/rowboat/app/api/v1/[projectId]/chat/route.ts
+++ b/apps/rowboat/app/api/v1/[projectId]/chat/route.ts
@@ -55,7 +55,7 @@ export async function POST(
                     controller.close();
                 } catch (error) {
                     logger.log(`Error processing stream: ${error}`);
-                    controller.error(error);
+                    controller.error(new Error("Something went wrong. Please try again."));
                 }
             },
         });
diff --git a/apps/rowboat/app/scripts/rag-worker.ts b/apps/rowboat/app/scripts/rag-worker.ts
index a0020b9c..3142a652 100644
--- a/apps/rowboat/app/scripts/rag-worker.ts
+++ b/apps/rowboat/app/scripts/rag-worker.ts
@@ -433,7 +433,7 @@ async function runDeletionPipeline(_logger: PrefixLogger, job: z.infer<typeof Da
                     logger.log("Error processing doc:", e);
                     await dataSourceDocsRepository.updateByVersion(doc.id, doc.version, {
                         status: "error",
-                        error: e.message,
+                        error: "Error processing doc",
                     });
                 } finally {
                     // log usage in billing
@@ -466,7 +466,7 @@ async function runDeletionPipeline(_logger: PrefixLogger, job: z.infer<typeof Da
                     logger.log("Error deleting doc:", e);
                     await dataSourceDocsRepository.updateByVersion(doc.id, doc.version, {
                         status: "error",
-                        error: e.message,
+                        error: "Error deleting doc",
                     });
                 }
             }
diff --git a/apps/rowboat/src/application/lib/agents-runtime/agent-tools.ts b/apps/rowboat/src/application/lib/agents-runtime/agent-tools.ts
index c55f70ac..f334c775 100644
--- a/apps/rowboat/src/application/lib/agents-runtime/agent-tools.ts
+++ b/apps/rowboat/src/application/lib/agents-runtime/agent-tools.ts
@@ -412,7 +412,7 @@ export function createMockTool(
             } catch (error) {
                 logger.log(`Error executing mock tool ${config.name}:`, error);
                 return JSON.stringify({
-                    error: `Mock tool execution failed: ${error}`,
+                    error: "Tool execution failed!",
                 });
             }
         }
@@ -447,7 +447,7 @@ export function createWebhookTool(
             } catch (error) {
                 logger.log(`Error executing webhook tool ${config.name}:`, error);
                 return JSON.stringify({
-                    error: `Tool execution failed: ${error}`,
+                    error: "Tool execution failed!",
                 });
             }
         }
@@ -482,7 +482,7 @@ export function createMcpTool(
             } catch (error) {
                 logger.log(`Error executing mcp tool ${name}:`, error);
                 return JSON.stringify({
-                    error: `Tool execution failed: ${error}`,
+                    error: "Tool execution failed!",
                 });
             }
         }
@@ -521,7 +521,7 @@ export function createComposioTool(
             } catch (error) {
                 logger.log(`Error executing composio tool ${name}:`, error);
                 return JSON.stringify({
-                    error: `Tool execution failed: ${error}`,
+                    error: "Tool execution failed!",
                 });
             }
         }
diff --git a/apps/rowboat/src/application/workers/jobs.worker.ts b/apps/rowboat/src/application/workers/jobs.worker.ts
index ee67ab2a..ee5a74a1 100644
--- a/apps/rowboat/src/application/workers/jobs.worker.ts
+++ b/apps/rowboat/src/application/workers/jobs.worker.ts
@@ -120,7 +120,7 @@ export class JobsWorker implements IJobsWorker {
             await this.jobsRepository.update(job.id, {
                 status: "failed",
                 output: {
-                    error: error instanceof Error ? error.message : "Unknown error",
+                    error: "Something went wrong. Please try again.",
                 },
             });
         } finally {

From 0b31585141715c94bc1f0892da00403e8b37ed77 Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:40:20 +0530
Subject: [PATCH 02/15] improve minute alignment logic

---
 .../application/lib/utils/time-to-next-minute.ts  |  6 ++++++
 .../src/application/workers/job-rules.worker.ts   | 15 +++------------
 .../policies/redis.usage-quota.policy.ts          |  3 ++-
 3 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 apps/rowboat/src/application/lib/utils/time-to-next-minute.ts

diff --git a/apps/rowboat/src/application/lib/utils/time-to-next-minute.ts b/apps/rowboat/src/application/lib/utils/time-to-next-minute.ts
new file mode 100644
index 00000000..b5996681
--- /dev/null
+++ b/apps/rowboat/src/application/lib/utils/time-to-next-minute.ts
@@ -0,0 +1,6 @@
+// returns the number of seconds until the next minute
+export function secondsToNextMinute(): number {
+    const now = new Date();
+    const secondsUntilNextMinute = 60 - now.getSeconds();
+    return secondsUntilNextMinute;
+}
\ No newline at end of file
diff --git a/apps/rowboat/src/application/workers/job-rules.worker.ts b/apps/rowboat/src/application/workers/job-rules.worker.ts
index 5b03e025..039665b7 100644
--- a/apps/rowboat/src/application/workers/job-rules.worker.ts
+++ b/apps/rowboat/src/application/workers/job-rules.worker.ts
@@ -8,6 +8,7 @@ import { z } from "zod";
 import { nanoid } from "nanoid";
 import { PrefixLogger } from "@/app/lib/utils";
 import { RecurringJobRule } from "@/src/entities/models/recurring-job-rule";
+import { secondsToNextMinute } from "../lib/utils/time-to-next-minute";
 
 export interface IJobRulesWorker {
     run(): Promise<void>;
@@ -20,8 +21,6 @@ export class JobRulesWorker implements IJobRulesWorker {
     private readonly jobsRepository: IJobsRepository;
     private readonly projectsRepository: IProjectsRepository;
     private readonly pubSubService: IPubSubService;
-    // Run polls aligned to minute marks at this offset (e.g., 2000 ms => :02 each minute)
-    private readonly minuteAlignmentOffsetMs: number = 2_000;
     private workerId: string;
     private logger: PrefixLogger;
     private isRunning: boolean = false;
@@ -131,14 +130,6 @@ export class JobRulesWorker implements IJobRulesWorker {
         }
     }
 
-    // Calculates delay so the next run happens at next minute + minuteAlignmentOffsetMs
-    private calculateDelayToNextAlignedMinute(): number {
-        const now = new Date();
-        const millisecondsUntilNextMinute = (60 - now.getSeconds()) * 1000 - now.getMilliseconds();
-        const delayMs = millisecondsUntilNextMinute + this.minuteAlignmentOffsetMs;
-        return delayMs > 0 ? delayMs : this.minuteAlignmentOffsetMs;
-    }
-
     private async pollScheduled(): Promise<void> {
         const logger = this.logger.child(`poll-scheduled`);
         logger.log("Polling...");
@@ -176,7 +167,8 @@ export class JobRulesWorker implements IJobRulesWorker {
     }
 
     private scheduleNextPoll(): void {
-        const delayMs = this.calculateDelayToNextAlignedMinute();
+        // schedule next poll for 2 s past the minute mark
+        const delayMs = (secondsToNextMinute() + 2) * 1000;
         this.logger.log(`Scheduling next poll in ${delayMs} ms`);
         this.pollTimeoutId = setTimeout(async () => {
             if (!this.isRunning) return;
@@ -195,7 +187,6 @@ export class JobRulesWorker implements IJobRulesWorker {
         }
         this.isRunning = true;
         this.logger.log(`Starting worker ${this.workerId}`);
-        // No immediate polling; align to 2s past the next minute
         this.scheduleNextPoll();
     }
 
diff --git a/apps/rowboat/src/infrastructure/policies/redis.usage-quota.policy.ts b/apps/rowboat/src/infrastructure/policies/redis.usage-quota.policy.ts
index 05fecbdb..29fe2d08 100644
--- a/apps/rowboat/src/infrastructure/policies/redis.usage-quota.policy.ts
+++ b/apps/rowboat/src/infrastructure/policies/redis.usage-quota.policy.ts
@@ -1,6 +1,7 @@
 import { IUsageQuotaPolicy } from "@/src/application/policies/usage-quota.policy.interface";
 import { redisClient } from "@/app/lib/redis";
 import { QuotaExceededError } from "@/src/entities/errors/common";
+import { secondsToNextMinute } from "@/src/application/lib/utils/time-to-next-minute";
 
 const MAX_QUERIES_PER_MINUTE = Number(process.env.MAX_QUERIES_PER_MINUTE) || 0;
 
@@ -15,7 +16,7 @@ export class RedisUsageQuotaPolicy implements IUsageQuotaPolicy {
 
         const count = await redisClient.incr(key);
         if (count === 1) {
-            await redisClient.expire(key, 70); // Set TTL to clean up automatically
+            await redisClient.expire(key, secondsToNextMinute()); // Set TTL to clean up automatically
         }
 
         if (count > MAX_QUERIES_PER_MINUTE) {

From d2e590956bd6c9344f14f82df68a2baaf7bfda1b Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Wed, 20 Aug 2025 17:08:19 +0530
Subject: [PATCH 03/15] enforce max jobs per hour

---
 apps/rowboat/app/actions/copilot.actions.ts   |  6 ++---
 .../lib/utils/time-to-next-minute.ts          |  6 +++++
 .../policies/usage-quota.policy.interface.ts  | 21 +++++++++++++--
 ...te-composio-trigger-deployment.use-case.ts |  2 +-
 ...te-composio-trigger-deployment.use-case.ts |  2 +-
 ...ch-composio-trigger-deployment.use-case.ts |  2 +-
 ...t-composio-trigger-deployments.use-case.ts |  2 +-
 .../create-cached-turn.use-case.ts            |  2 +-
 .../create-conversation.use-case.ts           |  2 +-
 .../fetch-cached-turn.use-case.ts             |  2 +-
 .../fetch-conversation.use-case.ts            |  2 +-
 .../list-conversations.use-case.ts            |  2 +-
 .../run-conversation-turn.use-case.ts         |  2 +-
 .../add-docs-to-data-source.use-case.ts       |  2 +-
 .../create-data-source.use-case.ts            |  2 +-
 .../delete-data-source.use-case.ts            |  2 +-
 .../delete-doc-from-data-source.use-case.ts   |  2 +-
 .../fetch-data-source.use-case.ts             |  2 +-
 .../get-download-url-for-file.use-case.ts     |  2 +-
 .../get-upload-urls-for-files.use-case.ts     |  2 +-
 .../list-data-sources.use-case.ts             |  2 +-
 .../list-docs-in-data-source.use-case.ts      |  2 +-
 .../recrawl-web-data-source.use-case.ts       |  2 +-
 .../toggle-data-source.use-case.ts            |  2 +-
 .../update-data-source.use-case.ts            |  2 +-
 .../use-cases/jobs/fetch-job.use-case.ts      |  2 +-
 .../use-cases/jobs/list-jobs.use-case.ts      |  2 +-
 .../add-custom-mcp-server.use-case.ts         |  2 +-
 ...osio-managed-connected-account.use-case.ts |  2 +-
 ...reate-custom-connected-account.use-case.ts |  2 +-
 .../projects/create-project.use-case.ts       |  2 +-
 ...ete-composio-connected-account.use-case.ts |  2 +-
 .../projects/fetch-project.use-case.ts        |  2 +-
 .../projects/get-composio-toolkit.use-case.ts |  2 +-
 .../list-composio-toolkits.use-case.ts        |  2 +-
 .../projects/list-composio-tools.use-case.ts  |  2 +-
 .../remove-custom-mcp-server.use-case.ts      |  2 +-
 .../revert-to-live-workflow.use-case.ts       |  2 +-
 .../projects/rotate-secret.use-case.ts        |  2 +-
 .../sync-connected-account.use-case.ts        |  2 +-
 .../update-draft-workflow.use-case.ts         |  2 +-
 .../projects/update-live-workflow.use-case.ts |  2 +-
 .../projects/update-project-name.use-case.ts  |  2 +-
 .../projects/update-webhook-url.use-case.ts   |  2 +-
 .../create-recurring-job-rule.use-case.ts     |  2 +-
 .../delete-recurring-job-rule.use-case.ts     |  2 +-
 .../fetch-recurring-job-rule.use-case.ts      |  2 +-
 .../list-recurring-job-rules.use-case.ts      |  2 +-
 .../toggle-recurring-job-rule.use-case.ts     |  2 +-
 .../create-scheduled-job-rule.use-case.ts     |  2 +-
 .../delete-scheduled-job-rule.use-case.ts     |  2 +-
 .../fetch-scheduled-job-rule.use-case.ts      |  2 +-
 .../list-scheduled-job-rules.use-case.ts      |  2 +-
 .../src/application/workers/jobs.worker.ts    | 27 ++++++++++++++++---
 .../policies/redis.usage-quota.policy.ts      | 23 ++++++++++++++--
 55 files changed, 123 insertions(+), 60 deletions(-)

diff --git a/apps/rowboat/app/actions/copilot.actions.ts b/apps/rowboat/app/actions/copilot.actions.ts
index 5dc6c897..5712e0af 100644
--- a/apps/rowboat/app/actions/copilot.actions.ts
+++ b/apps/rowboat/app/actions/copilot.actions.ts
@@ -28,7 +28,7 @@ export async function getCopilotResponseStream(
     streamId: string;
 } | { billingError: string }> {
     await projectAuthCheck(projectId);
-    await usageQuotaPolicy.assertAndConsume(projectId);
+    await usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
     // Check billing authorization
     const authResponse = await authorizeUserAction({
@@ -38,7 +38,7 @@ export async function getCopilotResponseStream(
         return { billingError: authResponse.error || 'Billing error' };
     }
 
-    await usageQuotaPolicy.assertAndConsume(projectId);
+    await usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
     
     // prepare request
     const request: z.infer<typeof CopilotAPIRequest> = {
@@ -70,7 +70,7 @@ export async function getCopilotAgentInstructions(
     agentName: string,
 ): Promise<string | { billingError: string }> {
     await projectAuthCheck(projectId);
-    await usageQuotaPolicy.assertAndConsume(projectId);
+    await usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
     // Check billing authorization
     const authResponse = await authorizeUserAction({
diff --git a/apps/rowboat/src/application/lib/utils/time-to-next-minute.ts b/apps/rowboat/src/application/lib/utils/time-to-next-minute.ts
index b5996681..808cbe99 100644
--- a/apps/rowboat/src/application/lib/utils/time-to-next-minute.ts
+++ b/apps/rowboat/src/application/lib/utils/time-to-next-minute.ts
@@ -3,4 +3,10 @@ export function secondsToNextMinute(): number {
     const now = new Date();
     const secondsUntilNextMinute = 60 - now.getSeconds();
     return secondsUntilNextMinute;
+}
+
+export function minutesToNextHour(): number {
+    const now = new Date();
+    const minutesUntilNextHour = 60 - now.getMinutes();
+    return minutesUntilNextHour;
 }
\ No newline at end of file
diff --git a/apps/rowboat/src/application/policies/usage-quota.policy.interface.ts b/apps/rowboat/src/application/policies/usage-quota.policy.interface.ts
index 20618588..4e311d63 100644
--- a/apps/rowboat/src/application/policies/usage-quota.policy.interface.ts
+++ b/apps/rowboat/src/application/policies/usage-quota.policy.interface.ts
@@ -1,4 +1,21 @@
+import { QuotaExceededError } from "@/src/entities/errors/common";
+
 export interface IUsageQuotaPolicy {
-    // this method will throw a QuotaExceededError if the quota is exceeded
-    assertAndConsume(projectId: string): Promise<void>;
+    /**
+     * Asserts that the project has not exceeded its usage quota and consumes the action.
+     * Used for general project actions.
+     * 
+     * @param projectId - The ID of the project to assert and consume.
+     * @throws QuotaExceededError if the quota is exceeded.
+     */
+    assertAndConsumeProjectAction(projectId: string): Promise<void>;
+
+
+    /**
+     * Asserts that the project has not exceeded its usage quota for running jobs.
+     * 
+     * @param projectId - The ID of the project to assert and consume.
+     * @throws QuotaExceededError if the quota is exceeded.
+     */
+    assertAndConsumeRunJobAction(projectId: string): Promise<void>;
 }
\ No newline at end of file
diff --git a/apps/rowboat/src/application/use-cases/composio-trigger-deployments/create-composio-trigger-deployment.use-case.ts b/apps/rowboat/src/application/use-cases/composio-trigger-deployments/create-composio-trigger-deployment.use-case.ts
index fdd3bbfc..1b6c3786 100644
--- a/apps/rowboat/src/application/use-cases/composio-trigger-deployments/create-composio-trigger-deployment.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/composio-trigger-deployments/create-composio-trigger-deployment.use-case.ts
@@ -59,7 +59,7 @@ export class CreateComposioTriggerDeploymentUseCase implements ICreateComposioTr
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // get trigger type info
         const triggerType = await getTriggersType(request.data.triggerTypeSlug);
diff --git a/apps/rowboat/src/application/use-cases/composio-trigger-deployments/delete-composio-trigger-deployment.use-case.ts b/apps/rowboat/src/application/use-cases/composio-trigger-deployments/delete-composio-trigger-deployment.use-case.ts
index f3d998f2..26373815 100644
--- a/apps/rowboat/src/application/use-cases/composio-trigger-deployments/delete-composio-trigger-deployment.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/composio-trigger-deployments/delete-composio-trigger-deployment.use-case.ts
@@ -54,7 +54,7 @@ export class DeleteComposioTriggerDeploymentUseCase implements IDeleteComposioTr
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // ensure deployment belongs to this project
         const deployment = await this.composioTriggerDeploymentsRepository.fetch(request.deploymentId);
diff --git a/apps/rowboat/src/application/use-cases/composio-trigger-deployments/fetch-composio-trigger-deployment.use-case.ts b/apps/rowboat/src/application/use-cases/composio-trigger-deployments/fetch-composio-trigger-deployment.use-case.ts
index ed0be2de..32aa7909 100644
--- a/apps/rowboat/src/application/use-cases/composio-trigger-deployments/fetch-composio-trigger-deployment.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/composio-trigger-deployments/fetch-composio-trigger-deployment.use-case.ts
@@ -53,7 +53,7 @@ export class FetchComposioTriggerDeploymentUseCase implements IFetchComposioTrig
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         return deployment;
     }
diff --git a/apps/rowboat/src/application/use-cases/composio-trigger-deployments/list-composio-trigger-deployments.use-case.ts b/apps/rowboat/src/application/use-cases/composio-trigger-deployments/list-composio-trigger-deployments.use-case.ts
index d233b096..f915e187 100644
--- a/apps/rowboat/src/application/use-cases/composio-trigger-deployments/list-composio-trigger-deployments.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/composio-trigger-deployments/list-composio-trigger-deployments.use-case.ts
@@ -51,7 +51,7 @@ export class ListComposioTriggerDeploymentsUseCase implements IListComposioTrigg
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // fetch deployments for project
         return await this.composioTriggerDeploymentsRepository.listByProjectId(projectId, request.cursor, limit);
diff --git a/apps/rowboat/src/application/use-cases/conversations/create-cached-turn.use-case.ts b/apps/rowboat/src/application/use-cases/conversations/create-cached-turn.use-case.ts
index 3d7bdb3b..c122e7f4 100644
--- a/apps/rowboat/src/application/use-cases/conversations/create-cached-turn.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/conversations/create-cached-turn.use-case.ts
@@ -61,7 +61,7 @@ export class CreateCachedTurnUseCase implements ICreateCachedTurnUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // create cache entry
         const key = nanoid();
diff --git a/apps/rowboat/src/application/use-cases/conversations/create-conversation.use-case.ts b/apps/rowboat/src/application/use-cases/conversations/create-conversation.use-case.ts
index e3ac496a..d73ac340 100644
--- a/apps/rowboat/src/application/use-cases/conversations/create-conversation.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/conversations/create-conversation.use-case.ts
@@ -61,7 +61,7 @@ export class CreateConversationUseCase implements ICreateConversationUseCase {
         }
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // if workflow is not provided, fetch workflow
         if (!workflow) {
diff --git a/apps/rowboat/src/application/use-cases/conversations/fetch-cached-turn.use-case.ts b/apps/rowboat/src/application/use-cases/conversations/fetch-cached-turn.use-case.ts
index 273fdab3..3154f6f7 100644
--- a/apps/rowboat/src/application/use-cases/conversations/fetch-cached-turn.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/conversations/fetch-cached-turn.use-case.ts
@@ -68,7 +68,7 @@ export class FetchCachedTurnUseCase implements IFetchCachedTurnUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // delete from cache
         await this.cacheService.delete(`turn-${data.key}`);
diff --git a/apps/rowboat/src/application/use-cases/conversations/fetch-conversation.use-case.ts b/apps/rowboat/src/application/use-cases/conversations/fetch-conversation.use-case.ts
index b6a5ed26..0e1f5c01 100644
--- a/apps/rowboat/src/application/use-cases/conversations/fetch-conversation.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/conversations/fetch-conversation.use-case.ts
@@ -54,7 +54,7 @@ export class FetchConversationUseCase implements IFetchConversationUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // return the conversation
         return conversation;
diff --git a/apps/rowboat/src/application/use-cases/conversations/list-conversations.use-case.ts b/apps/rowboat/src/application/use-cases/conversations/list-conversations.use-case.ts
index d3b69afa..7891cc71 100644
--- a/apps/rowboat/src/application/use-cases/conversations/list-conversations.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/conversations/list-conversations.use-case.ts
@@ -51,7 +51,7 @@ export class ListConversationsUseCase implements IListConversationsUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // fetch conversations for project
         return await this.conversationsRepository.list(projectId, request.cursor, limit);
diff --git a/apps/rowboat/src/application/use-cases/conversations/run-conversation-turn.use-case.ts b/apps/rowboat/src/application/use-cases/conversations/run-conversation-turn.use-case.ts
index d8b05aed..635a960d 100644
--- a/apps/rowboat/src/application/use-cases/conversations/run-conversation-turn.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/conversations/run-conversation-turn.use-case.ts
@@ -62,7 +62,7 @@ export class RunConversationTurnUseCase implements IRunConversationTurnUseCase {
         }
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // Check billing auth
         let billingCustomerId: string | null = null;
diff --git a/apps/rowboat/src/application/use-cases/data-sources/add-docs-to-data-source.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/add-docs-to-data-source.use-case.ts
index be0cf3f3..2d732788 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/add-docs-to-data-source.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/add-docs-to-data-source.use-case.ts
@@ -55,7 +55,7 @@ export class AddDocsToDataSourceUseCase implements IAddDocsToDataSourceUseCase {
             projectId: source.projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(source.projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(source.projectId);
 
         await this.dataSourceDocsRepository.bulkCreate(source.projectId, sourceId, docs);
 
diff --git a/apps/rowboat/src/application/use-cases/data-sources/create-data-source.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/create-data-source.use-case.ts
index 3c7c4dbb..7d5e7110 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/create-data-source.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/create-data-source.use-case.ts
@@ -44,7 +44,7 @@ export class CreateDataSourceUseCase implements ICreateDataSourceUseCase {
             projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         let _status = "pending";
         // Only set status for non-file data sources
diff --git a/apps/rowboat/src/application/use-cases/data-sources/delete-data-source.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/delete-data-source.use-case.ts
index b09c38b0..9ef47942 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/delete-data-source.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/delete-data-source.use-case.ts
@@ -49,7 +49,7 @@ export class DeleteDataSourceUseCase implements IDeleteDataSourceUseCase {
             projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         await this.dataSourcesRepository.update(request.sourceId, {
             status: 'deleted',
diff --git a/apps/rowboat/src/application/use-cases/data-sources/delete-doc-from-data-source.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/delete-doc-from-data-source.use-case.ts
index f879f62d..7490a702 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/delete-doc-from-data-source.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/delete-doc-from-data-source.use-case.ts
@@ -54,7 +54,7 @@ export class DeleteDocFromDataSourceUseCase implements IDeleteDocFromDataSourceU
             projectId: doc.projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(doc.projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(doc.projectId);
 
         await this.dataSourceDocsRepository.markAsDeleted(docId);
 
diff --git a/apps/rowboat/src/application/use-cases/data-sources/fetch-data-source.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/fetch-data-source.use-case.ts
index f3d5f0a2..19b6a311 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/fetch-data-source.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/fetch-data-source.use-case.ts
@@ -50,7 +50,7 @@ export class FetchDataSourceUseCase implements IFetchDataSourceUseCase {
             projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         return source;
     }
diff --git a/apps/rowboat/src/application/use-cases/data-sources/get-download-url-for-file.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/get-download-url-for-file.use-case.ts
index f3da5d6e..e45dabfe 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/get-download-url-for-file.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/get-download-url-for-file.use-case.ts
@@ -58,7 +58,7 @@ export class GetDownloadUrlForFileUseCase implements IGetDownloadUrlForFileUseCa
             projectId: file.projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(file.projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(file.projectId);
 
         if (file.data.type === 'file_local') {
             // use the file id instead of path here
diff --git a/apps/rowboat/src/application/use-cases/data-sources/get-upload-urls-for-files.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/get-upload-urls-for-files.use-case.ts
index d044d85a..348fa7bd 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/get-upload-urls-for-files.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/get-upload-urls-for-files.use-case.ts
@@ -60,7 +60,7 @@ export class GetUploadUrlsForFilesUseCase implements IGetUploadUrlsForFilesUseCa
             projectId: source.projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(source.projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(source.projectId);
 
         const urls: { fileId: string, uploadUrl: string, path: string }[] = [];
         for (const file of files) {
diff --git a/apps/rowboat/src/application/use-cases/data-sources/list-data-sources.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/list-data-sources.use-case.ts
index 851266a0..99f70eae 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/list-data-sources.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/list-data-sources.use-case.ts
@@ -44,7 +44,7 @@ export class ListDataSourcesUseCase implements IListDataSourcesUseCase {
             projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // list all sources for now
         const sources = [];
diff --git a/apps/rowboat/src/application/use-cases/data-sources/list-docs-in-data-source.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/list-docs-in-data-source.use-case.ts
index 7a1eb9e4..94c66877 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/list-docs-in-data-source.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/list-docs-in-data-source.use-case.ts
@@ -55,7 +55,7 @@ export class ListDocsInDataSourceUseCase implements IListDocsInDataSourceUseCase
             projectId: source.projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(source.projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(source.projectId);
 
         // fetch all docs
         const docs = [];
diff --git a/apps/rowboat/src/application/use-cases/data-sources/recrawl-web-data-source.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/recrawl-web-data-source.use-case.ts
index 6ebf11dc..d9572034 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/recrawl-web-data-source.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/recrawl-web-data-source.use-case.ts
@@ -58,7 +58,7 @@ export class RecrawlWebDataSourceUseCase implements IRecrawlWebDataSourceUseCase
             projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         await this.dataSourceDocsRepository.markSourceDocsPending(request.sourceId);
 
diff --git a/apps/rowboat/src/application/use-cases/data-sources/toggle-data-source.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/toggle-data-source.use-case.ts
index 47f141a2..cafc0fbc 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/toggle-data-source.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/toggle-data-source.use-case.ts
@@ -51,7 +51,7 @@ export class ToggleDataSourceUseCase implements IToggleDataSourceUseCase {
             projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         return await this.dataSourcesRepository.update(request.sourceId, { active: request.active });
     }
diff --git a/apps/rowboat/src/application/use-cases/data-sources/update-data-source.use-case.ts b/apps/rowboat/src/application/use-cases/data-sources/update-data-source.use-case.ts
index abed87fd..fa4c08e2 100644
--- a/apps/rowboat/src/application/use-cases/data-sources/update-data-source.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/data-sources/update-data-source.use-case.ts
@@ -55,7 +55,7 @@ export class UpdateDataSourceUseCase implements IUpdateDataSourceUseCase {
             projectId,
         });
 
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         return await this.dataSourcesRepository.update(request.sourceId, request.data, true);
     }
diff --git a/apps/rowboat/src/application/use-cases/jobs/fetch-job.use-case.ts b/apps/rowboat/src/application/use-cases/jobs/fetch-job.use-case.ts
index 0156bc64..e18627fe 100644
--- a/apps/rowboat/src/application/use-cases/jobs/fetch-job.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/jobs/fetch-job.use-case.ts
@@ -54,7 +54,7 @@ export class FetchJobUseCase implements IFetchJobUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // return the job
         return job;
diff --git a/apps/rowboat/src/application/use-cases/jobs/list-jobs.use-case.ts b/apps/rowboat/src/application/use-cases/jobs/list-jobs.use-case.ts
index 95d4474a..d91adeae 100644
--- a/apps/rowboat/src/application/use-cases/jobs/list-jobs.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/jobs/list-jobs.use-case.ts
@@ -52,7 +52,7 @@ export class ListJobsUseCase implements IListJobsUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // fetch jobs for project
         return await this.jobsRepository.list(projectId, request.filters, request.cursor, limit);
diff --git a/apps/rowboat/src/application/use-cases/projects/add-custom-mcp-server.use-case.ts b/apps/rowboat/src/application/use-cases/projects/add-custom-mcp-server.use-case.ts
index dd4669ac..fc5855c3 100644
--- a/apps/rowboat/src/application/use-cases/projects/add-custom-mcp-server.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/add-custom-mcp-server.use-case.ts
@@ -48,7 +48,7 @@ export class AddCustomMcpServerUseCase implements IAddCustomMcpServerUseCase {
         const { caller, userId, apiKey, projectId, name } = request;
 
         await this.projectActionAuthorizationPolicy.authorize({ caller, userId, apiKey, projectId });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // Validate server URL
         const serverUrl = validateHttpHttpsUrl(request.server.serverUrl);
diff --git a/apps/rowboat/src/application/use-cases/projects/create-composio-managed-connected-account.use-case.ts b/apps/rowboat/src/application/use-cases/projects/create-composio-managed-connected-account.use-case.ts
index 4536c8fd..c53b7aa9 100644
--- a/apps/rowboat/src/application/use-cases/projects/create-composio-managed-connected-account.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/create-composio-managed-connected-account.use-case.ts
@@ -44,7 +44,7 @@ export class CreateComposioManagedConnectedAccountUseCase implements ICreateComp
         const { caller, userId, apiKey, projectId, toolkitSlug, callbackUrl } = request;
 
         await this.projectActionAuthorizationPolicy.authorize({ caller, userId, apiKey, projectId });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // fetch managed auth configs
         const configs = await listAuthConfigs(toolkitSlug, null, true);
diff --git a/apps/rowboat/src/application/use-cases/projects/create-custom-connected-account.use-case.ts b/apps/rowboat/src/application/use-cases/projects/create-custom-connected-account.use-case.ts
index da3110fa..c547a1e9 100644
--- a/apps/rowboat/src/application/use-cases/projects/create-custom-connected-account.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/create-custom-connected-account.use-case.ts
@@ -50,7 +50,7 @@ export class CreateCustomConnectedAccountUseCase implements ICreateCustomConnect
         const { caller, userId, apiKey, projectId, toolkitSlug, authConfig, callbackUrl } = request;
 
         await this.projectActionAuthorizationPolicy.authorize({ caller, userId, apiKey, projectId });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // create custom auth config
         const created: z.infer<typeof ZCreateAuthConfigResponse> = await createAuthConfig({
diff --git a/apps/rowboat/src/application/use-cases/projects/create-project.use-case.ts b/apps/rowboat/src/application/use-cases/projects/create-project.use-case.ts
index 260139cd..c439c788 100644
--- a/apps/rowboat/src/application/use-cases/projects/create-project.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/create-project.use-case.ts
@@ -113,7 +113,7 @@ export class CreateProjectUseCase implements ICreateProjectUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(project.id);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(project.id);
 
         return project;
     }
diff --git a/apps/rowboat/src/application/use-cases/projects/delete-composio-connected-account.use-case.ts b/apps/rowboat/src/application/use-cases/projects/delete-composio-connected-account.use-case.ts
index cdc36f22..56cce560 100644
--- a/apps/rowboat/src/application/use-cases/projects/delete-composio-connected-account.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/delete-composio-connected-account.use-case.ts
@@ -56,7 +56,7 @@ export class DeleteComposioConnectedAccountUseCase implements IDeleteComposioCon
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // fetch project
         const project = await this.projectsRepository.fetch(projectId);
diff --git a/apps/rowboat/src/application/use-cases/projects/fetch-project.use-case.ts b/apps/rowboat/src/application/use-cases/projects/fetch-project.use-case.ts
index 7773c38f..03b292c3 100644
--- a/apps/rowboat/src/application/use-cases/projects/fetch-project.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/fetch-project.use-case.ts
@@ -52,7 +52,7 @@ export class FetchProjectUseCase implements IFetchProjectUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         return await this.projectsRepository.fetch(projectId);
     }
diff --git a/apps/rowboat/src/application/use-cases/projects/get-composio-toolkit.use-case.ts b/apps/rowboat/src/application/use-cases/projects/get-composio-toolkit.use-case.ts
index b7611069..a2d2d9a6 100644
--- a/apps/rowboat/src/application/use-cases/projects/get-composio-toolkit.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/get-composio-toolkit.use-case.ts
@@ -28,7 +28,7 @@ export class GetComposioToolkitUseCase implements IGetComposioToolkitUseCase {
     async execute(request: z.infer<typeof InputSchema>): Promise<z.infer<typeof ZGetToolkitResponse>> {
         const { caller, userId, apiKey, projectId, toolkitSlug } = request;
         await this.projectActionAuthorizationPolicy.authorize({ caller, userId, apiKey, projectId });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
         return await getToolkit(toolkitSlug);
     }
 }
diff --git a/apps/rowboat/src/application/use-cases/projects/list-composio-toolkits.use-case.ts b/apps/rowboat/src/application/use-cases/projects/list-composio-toolkits.use-case.ts
index becf43d7..b952f342 100644
--- a/apps/rowboat/src/application/use-cases/projects/list-composio-toolkits.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/list-composio-toolkits.use-case.ts
@@ -29,7 +29,7 @@ export class ListComposioToolkitsUseCase implements IListComposioToolkitsUseCase
     async execute(request: z.infer<typeof InputSchema>): Promise<z.infer<ReturnType<typeof ZListResponse<typeof ZToolkit>>>> {
         const { caller, userId, apiKey, projectId, cursor } = request;
         await this.projectActionAuthorizationPolicy.authorize({ caller, userId, apiKey, projectId });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
         return await listToolkits(cursor ?? null);
     }
 }
diff --git a/apps/rowboat/src/application/use-cases/projects/list-composio-tools.use-case.ts b/apps/rowboat/src/application/use-cases/projects/list-composio-tools.use-case.ts
index 3a53992c..04278aa9 100644
--- a/apps/rowboat/src/application/use-cases/projects/list-composio-tools.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/list-composio-tools.use-case.ts
@@ -31,7 +31,7 @@ export class ListComposioToolsUseCase implements IListComposioToolsUseCase {
     async execute(request: z.infer<typeof InputSchema>): Promise<z.infer<ReturnType<typeof ZListResponse<typeof ZTool>>>> {
         const { caller, userId, apiKey, projectId, toolkitSlug, searchQuery, cursor } = request;
         await this.projectActionAuthorizationPolicy.authorize({ caller, userId, apiKey, projectId });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
         return await listTools(toolkitSlug, searchQuery ?? null, cursor ?? null);
     }
 }
diff --git a/apps/rowboat/src/application/use-cases/projects/remove-custom-mcp-server.use-case.ts b/apps/rowboat/src/application/use-cases/projects/remove-custom-mcp-server.use-case.ts
index 6a588045..74455fbb 100644
--- a/apps/rowboat/src/application/use-cases/projects/remove-custom-mcp-server.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/remove-custom-mcp-server.use-case.ts
@@ -37,7 +37,7 @@ export class RemoveCustomMcpServerUseCase implements IRemoveCustomMcpServerUseCa
     async execute(request: z.infer<typeof InputSchema>): Promise<void> {
         const { caller, userId, apiKey, projectId, name } = request;
         await this.projectActionAuthorizationPolicy.authorize({ caller, userId, apiKey, projectId });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
         await this.projectsRepository.deleteCustomMcpServer(projectId, name);
     }
 }
diff --git a/apps/rowboat/src/application/use-cases/projects/revert-to-live-workflow.use-case.ts b/apps/rowboat/src/application/use-cases/projects/revert-to-live-workflow.use-case.ts
index 150dc5f8..a8d0aae4 100644
--- a/apps/rowboat/src/application/use-cases/projects/revert-to-live-workflow.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/revert-to-live-workflow.use-case.ts
@@ -42,7 +42,7 @@ export class RevertToLiveWorkflowUseCase implements IRevertToLiveWorkflowUseCase
             apiKey: request.apiKey,
             projectId,
         });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         const project = await this.projectsRepository.fetch(projectId);
         if (!project) {
diff --git a/apps/rowboat/src/application/use-cases/projects/rotate-secret.use-case.ts b/apps/rowboat/src/application/use-cases/projects/rotate-secret.use-case.ts
index f2abdbaa..67e33737 100644
--- a/apps/rowboat/src/application/use-cases/projects/rotate-secret.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/rotate-secret.use-case.ts
@@ -37,7 +37,7 @@ export class RotateSecretUseCase implements IRotateSecretUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         const secret = crypto.randomBytes(32).toString("hex");
         await this.projectsRepository.updateSecret(projectId, secret);
diff --git a/apps/rowboat/src/application/use-cases/projects/sync-connected-account.use-case.ts b/apps/rowboat/src/application/use-cases/projects/sync-connected-account.use-case.ts
index c3d908fc..089585c9 100644
--- a/apps/rowboat/src/application/use-cases/projects/sync-connected-account.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/sync-connected-account.use-case.ts
@@ -42,7 +42,7 @@ export class SyncConnectedAccountUseCase implements ISyncConnectedAccountUseCase
         const { caller, userId, apiKey, projectId, toolkitSlug, connectedAccountId } = request;
 
         await this.projectActionAuthorizationPolicy.authorize({ caller, userId, apiKey, projectId });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // fetch project & account to verify
         const project = await this.projectsRepository.fetch(projectId);
diff --git a/apps/rowboat/src/application/use-cases/projects/update-draft-workflow.use-case.ts b/apps/rowboat/src/application/use-cases/projects/update-draft-workflow.use-case.ts
index fe1ecc37..14743e61 100644
--- a/apps/rowboat/src/application/use-cases/projects/update-draft-workflow.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/update-draft-workflow.use-case.ts
@@ -43,7 +43,7 @@ export class UpdateDraftWorkflowUseCase implements IUpdateDraftWorkflowUseCase {
             apiKey: request.apiKey,
             projectId,
         });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         const workflow = { ...request.workflow, lastUpdatedAt: new Date().toISOString() } as z.infer<typeof Workflow>;
         await this.projectsRepository.updateDraftWorkflow(projectId, workflow);
diff --git a/apps/rowboat/src/application/use-cases/projects/update-live-workflow.use-case.ts b/apps/rowboat/src/application/use-cases/projects/update-live-workflow.use-case.ts
index e1c770f0..ebf13e38 100644
--- a/apps/rowboat/src/application/use-cases/projects/update-live-workflow.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/update-live-workflow.use-case.ts
@@ -43,7 +43,7 @@ export class UpdateLiveWorkflowUseCase implements IUpdateLiveWorkflowUseCase {
             apiKey: request.apiKey,
             projectId,
         });
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         const workflow = { ...request.workflow, lastUpdatedAt: new Date().toISOString() } as z.infer<typeof Workflow>;
         await this.projectsRepository.updateLiveWorkflow(projectId, workflow);
diff --git a/apps/rowboat/src/application/use-cases/projects/update-project-name.use-case.ts b/apps/rowboat/src/application/use-cases/projects/update-project-name.use-case.ts
index 7c768fc3..b1562d1d 100644
--- a/apps/rowboat/src/application/use-cases/projects/update-project-name.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/update-project-name.use-case.ts
@@ -36,7 +36,7 @@ export class UpdateProjectNameUseCase implements IUpdateProjectNameUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         await this.projectsRepository.updateName(projectId, name);
     }
diff --git a/apps/rowboat/src/application/use-cases/projects/update-webhook-url.use-case.ts b/apps/rowboat/src/application/use-cases/projects/update-webhook-url.use-case.ts
index 56ed6268..b71fd487 100644
--- a/apps/rowboat/src/application/use-cases/projects/update-webhook-url.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/update-webhook-url.use-case.ts
@@ -36,7 +36,7 @@ export class UpdateWebhookUrlUseCase implements IUpdateWebhookUrlUseCase {
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         await this.projectsRepository.updateWebhookUrl(projectId, url);
     }
diff --git a/apps/rowboat/src/application/use-cases/recurring-job-rules/create-recurring-job-rule.use-case.ts b/apps/rowboat/src/application/use-cases/recurring-job-rules/create-recurring-job-rule.use-case.ts
index e7bf8365..0c2c2c0c 100644
--- a/apps/rowboat/src/application/use-cases/recurring-job-rules/create-recurring-job-rule.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/recurring-job-rules/create-recurring-job-rule.use-case.ts
@@ -55,7 +55,7 @@ export class CreateRecurringJobRuleUseCase implements ICreateRecurringJobRuleUse
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(request.projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(request.projectId);
 
         // create the recurring job rule
         const rule = await this.recurringJobRulesRepository.create({
diff --git a/apps/rowboat/src/application/use-cases/recurring-job-rules/delete-recurring-job-rule.use-case.ts b/apps/rowboat/src/application/use-cases/recurring-job-rules/delete-recurring-job-rule.use-case.ts
index dec59bca..2cb3c98e 100644
--- a/apps/rowboat/src/application/use-cases/recurring-job-rules/delete-recurring-job-rule.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/recurring-job-rules/delete-recurring-job-rule.use-case.ts
@@ -45,7 +45,7 @@ export class DeleteRecurringJobRuleUseCase implements IDeleteRecurringJobRuleUse
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(request.projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(request.projectId);
 
         // ensure rule belongs to this project
         const rule = await this.recurringJobRulesRepository.fetch(request.ruleId);
diff --git a/apps/rowboat/src/application/use-cases/recurring-job-rules/fetch-recurring-job-rule.use-case.ts b/apps/rowboat/src/application/use-cases/recurring-job-rules/fetch-recurring-job-rule.use-case.ts
index cd89ba2c..6d3846d9 100644
--- a/apps/rowboat/src/application/use-cases/recurring-job-rules/fetch-recurring-job-rule.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/recurring-job-rules/fetch-recurring-job-rule.use-case.ts
@@ -54,7 +54,7 @@ export class FetchRecurringJobRuleUseCase implements IFetchRecurringJobRuleUseCa
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // return the rule
         return rule;
diff --git a/apps/rowboat/src/application/use-cases/recurring-job-rules/list-recurring-job-rules.use-case.ts b/apps/rowboat/src/application/use-cases/recurring-job-rules/list-recurring-job-rules.use-case.ts
index 22f45186..9dbe0a42 100644
--- a/apps/rowboat/src/application/use-cases/recurring-job-rules/list-recurring-job-rules.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/recurring-job-rules/list-recurring-job-rules.use-case.ts
@@ -49,7 +49,7 @@ export class ListRecurringJobRulesUseCase implements IListRecurringJobRulesUseCa
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // fetch recurring job rules for project
         return await this.recurringJobRulesRepository.list(projectId, request.cursor, limit);
diff --git a/apps/rowboat/src/application/use-cases/recurring-job-rules/toggle-recurring-job-rule.use-case.ts b/apps/rowboat/src/application/use-cases/recurring-job-rules/toggle-recurring-job-rule.use-case.ts
index e7258fa5..8bb52a28 100644
--- a/apps/rowboat/src/application/use-cases/recurring-job-rules/toggle-recurring-job-rule.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/recurring-job-rules/toggle-recurring-job-rule.use-case.ts
@@ -55,7 +55,7 @@ export class ToggleRecurringJobRuleUseCase implements IToggleRecurringJobRuleUse
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // update the rule
         return await this.recurringJobRulesRepository.toggle(request.ruleId, request.disabled);
diff --git a/apps/rowboat/src/application/use-cases/scheduled-job-rules/create-scheduled-job-rule.use-case.ts b/apps/rowboat/src/application/use-cases/scheduled-job-rules/create-scheduled-job-rule.use-case.ts
index 06170434..544a5519 100644
--- a/apps/rowboat/src/application/use-cases/scheduled-job-rules/create-scheduled-job-rule.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/scheduled-job-rules/create-scheduled-job-rule.use-case.ts
@@ -50,7 +50,7 @@ export class CreateScheduledJobRuleUseCase implements ICreateScheduledJobRuleUse
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(request.projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(request.projectId);
 
         // create the scheduled job rule with UTC time
         const rule = await this.scheduledJobRulesRepository.create({
diff --git a/apps/rowboat/src/application/use-cases/scheduled-job-rules/delete-scheduled-job-rule.use-case.ts b/apps/rowboat/src/application/use-cases/scheduled-job-rules/delete-scheduled-job-rule.use-case.ts
index b7b7123f..6977fbbd 100644
--- a/apps/rowboat/src/application/use-cases/scheduled-job-rules/delete-scheduled-job-rule.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/scheduled-job-rules/delete-scheduled-job-rule.use-case.ts
@@ -45,7 +45,7 @@ export class DeleteScheduledJobRuleUseCase implements IDeleteScheduledJobRuleUse
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(request.projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(request.projectId);
 
         // ensure rule belongs to this project
         const rule = await this.scheduledJobRulesRepository.fetch(request.ruleId);
diff --git a/apps/rowboat/src/application/use-cases/scheduled-job-rules/fetch-scheduled-job-rule.use-case.ts b/apps/rowboat/src/application/use-cases/scheduled-job-rules/fetch-scheduled-job-rule.use-case.ts
index 6b5004cd..33b6b78c 100644
--- a/apps/rowboat/src/application/use-cases/scheduled-job-rules/fetch-scheduled-job-rule.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/scheduled-job-rules/fetch-scheduled-job-rule.use-case.ts
@@ -54,7 +54,7 @@ export class FetchScheduledJobRuleUseCase implements IFetchScheduledJobRuleUseCa
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // return the scheduled job rule
         return rule;
diff --git a/apps/rowboat/src/application/use-cases/scheduled-job-rules/list-scheduled-job-rules.use-case.ts b/apps/rowboat/src/application/use-cases/scheduled-job-rules/list-scheduled-job-rules.use-case.ts
index b5f79ce8..17a929fc 100644
--- a/apps/rowboat/src/application/use-cases/scheduled-job-rules/list-scheduled-job-rules.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/scheduled-job-rules/list-scheduled-job-rules.use-case.ts
@@ -49,7 +49,7 @@ export class ListScheduledJobRulesUseCase implements IListScheduledJobRulesUseCa
         });
 
         // assert and consume quota
-        await this.usageQuotaPolicy.assertAndConsume(projectId);
+        await this.usageQuotaPolicy.assertAndConsumeProjectAction(projectId);
 
         // fetch scheduled job rules for project
         return await this.scheduledJobRulesRepository.list(projectId, request.cursor, limit);
diff --git a/apps/rowboat/src/application/workers/jobs.worker.ts b/apps/rowboat/src/application/workers/jobs.worker.ts
index ee5a74a1..93e6af93 100644
--- a/apps/rowboat/src/application/workers/jobs.worker.ts
+++ b/apps/rowboat/src/application/workers/jobs.worker.ts
@@ -8,6 +8,8 @@ import { IPubSubService, Subscription } from "../services/pub-sub.service.interf
 import { nanoid } from "nanoid";
 import { z } from "zod";
 import { PrefixLogger } from "@/app/lib/utils";
+import { IUsageQuotaPolicy } from "../policies/usage-quota.policy.interface";
+import { QuotaExceededError } from "@/src/entities/errors/common";
 
 export interface IJobsWorker {
     run(): Promise<void>;
@@ -20,6 +22,7 @@ export class JobsWorker implements IJobsWorker {
     private readonly createConversationUseCase: ICreateConversationUseCase;
     private readonly runConversationTurnUseCase: IRunConversationTurnUseCase;
     private readonly pubSubService: IPubSubService;
+    private readonly usageQuotaPolicy: IUsageQuotaPolicy;
     private workerId: string;
     private subscription: Subscription | null = null;
     private isRunning: boolean = false;
@@ -33,18 +36,21 @@ export class JobsWorker implements IJobsWorker {
         createConversationUseCase,
         runConversationTurnUseCase,
         pubSubService,
+        usageQuotaPolicy,
     }: {
         jobsRepository: IJobsRepository;
         projectsRepository: IProjectsRepository;
         createConversationUseCase: ICreateConversationUseCase;
         runConversationTurnUseCase: IRunConversationTurnUseCase;
         pubSubService: IPubSubService;
+        usageQuotaPolicy: IUsageQuotaPolicy;
     }) {
         this.jobsRepository = jobsRepository;
         this.projectsRepository = projectsRepository;
         this.createConversationUseCase = createConversationUseCase;
         this.runConversationTurnUseCase = runConversationTurnUseCase;
         this.pubSubService = pubSubService;
+        this.usageQuotaPolicy = usageQuotaPolicy;
         this.workerId = nanoid();
         this.logger = new PrefixLogger(`jobs-worker-[${this.workerId}]`);
     }
@@ -52,7 +58,7 @@ export class JobsWorker implements IJobsWorker {
     async processJob(job: z.infer<typeof Job>): Promise<void> {
         const logger = this.logger.child(`job-${job.id}`);
         logger.log('Processing job');
-        
+
         try {
             // extract project id from job
             const { projectId } = job;
@@ -63,6 +69,9 @@ export class JobsWorker implements IJobsWorker {
                 throw new Error("Project not found");
             }
 
+            // check job-run quota usage
+            await this.usageQuotaPolicy.assertAndConsumeRunJobAction(projectId);
+
             // create conversation
             logger.log('Creating conversation');
             const conversation = await this.createConversationUseCase.execute({
@@ -114,6 +123,18 @@ export class JobsWorker implements IJobsWorker {
             });
             logger.log(`Completed successfully`);
         } catch (error) {
+            if (error instanceof QuotaExceededError) {
+                logger.log(`Failed due to quota exceeded`);
+
+                // update job
+                await this.jobsRepository.update(job.id, {
+                    status: "failed",
+                    output: {
+                        error: (error instanceof QuotaExceededError) ? error.message : "Usage quota exceeded.",
+                    },
+                });
+                return;
+            }
             logger.log(`Failed: ${error instanceof Error ? error.message : "Unknown error"}`);
             
             // update job
@@ -174,7 +195,7 @@ export class JobsWorker implements IJobsWorker {
             }
 
             logger.log(`Found job ${job.id} via polling`);
-            
+
             // process job
             await this.processJob(job);
         } catch (error) {
@@ -185,7 +206,7 @@ export class JobsWorker implements IJobsWorker {
     private async startPolling(): Promise<void> {
         const logger = this.logger.child(`start-polling`);
         logger.log("Starting polling mechanism");
-        
+
         const scheduleNextPoll = () => {
             this.pollTimeoutId = setTimeout(async () => {
                 await this.pollForJobs();
diff --git a/apps/rowboat/src/infrastructure/policies/redis.usage-quota.policy.ts b/apps/rowboat/src/infrastructure/policies/redis.usage-quota.policy.ts
index 29fe2d08..4b97ace0 100644
--- a/apps/rowboat/src/infrastructure/policies/redis.usage-quota.policy.ts
+++ b/apps/rowboat/src/infrastructure/policies/redis.usage-quota.policy.ts
@@ -1,12 +1,13 @@
 import { IUsageQuotaPolicy } from "@/src/application/policies/usage-quota.policy.interface";
 import { redisClient } from "@/app/lib/redis";
 import { QuotaExceededError } from "@/src/entities/errors/common";
-import { secondsToNextMinute } from "@/src/application/lib/utils/time-to-next-minute";
+import { secondsToNextMinute, minutesToNextHour } from "@/src/application/lib/utils/time-to-next-minute";
 
 const MAX_QUERIES_PER_MINUTE = Number(process.env.MAX_QUERIES_PER_MINUTE) || 0;
+const MAX_JOBS_PER_HOUR = Number(process.env.MAX_JOBS_PER_HOUR) || 0;
 
 export class RedisUsageQuotaPolicy implements IUsageQuotaPolicy {
-    async assertAndConsume(projectId: string): Promise<void> {
+    async assertAndConsumeProjectAction(projectId: string): Promise<void> {
         if (MAX_QUERIES_PER_MINUTE === 0) {
             return;
         }
@@ -23,4 +24,22 @@ export class RedisUsageQuotaPolicy implements IUsageQuotaPolicy {
             throw new QuotaExceededError(`Quota exceeded for project ${projectId}`);
         }
     }
+
+    async assertAndConsumeRunJobAction(projectId: string): Promise<void> {
+        if (MAX_JOBS_PER_HOUR === 0) {
+            return;
+        }
+
+        const hour_of_the_day = new Date().getHours();
+        const key = `jobs_limit:${projectId}:${hour_of_the_day}`;
+
+        const count = await redisClient.incr(key);
+        if (count === 1) {
+            await redisClient.expire(key, minutesToNextHour() * 60); // Set TTL to clean up automatically
+        }
+
+        if (count > MAX_JOBS_PER_HOUR) {
+            throw new QuotaExceededError(`Jobs quota exceeded for project ${projectId}`);
+        }
+    }
 }
\ No newline at end of file

From aef3771cd5da9daa8e049ff5d029b59305138a07 Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Thu, 21 Aug 2025 07:43:21 +0530
Subject: [PATCH 04/15] allow copilot to delete things, set start agent

---
 apps/rowboat/app/lib/client_utils.ts          |  8 +-
 .../copilot/components/actions.tsx            | 33 ++++---
 .../copilot/components/messages.tsx           | 45 ++++++++--
 .../lib/copilot/example_multi_agent_1.ts      | 88 +++++++++++++++++++
 .../src/application/lib/copilot/types.ts      |  4 +-
 5 files changed, 156 insertions(+), 22 deletions(-)

diff --git a/apps/rowboat/app/lib/client_utils.ts b/apps/rowboat/app/lib/client_utils.ts
index eea2bffb..90997d02 100644
--- a/apps/rowboat/app/lib/client_utils.ts
+++ b/apps/rowboat/app/lib/client_utils.ts
@@ -1,9 +1,11 @@
 import { WorkflowTool, WorkflowAgent, WorkflowPrompt, WorkflowPipeline } from "./types/workflow_types";
 import { z } from "zod";
 
+const ZFallbackSchema = z.object({}).passthrough();
+
 export function validateConfigChanges(configType: string, configChanges: Record<string, unknown>, name: string) {
     let testObject: any;
-    let schema: z.ZodType<any>;
+    let schema: z.ZodType<any> = ZFallbackSchema;
 
     switch (configType) {
         case 'tool': {
@@ -56,6 +58,10 @@ export function validateConfigChanges(configType: string, configChanges: Record<
             schema = WorkflowPipeline;
             break;
         }
+        case 'start_agent': {
+            testObject = {};
+            break;
+        }
         default:
             return { error: `Unknown config type: ${configType}` };
     }
diff --git a/apps/rowboat/app/projects/[projectId]/copilot/components/actions.tsx b/apps/rowboat/app/projects/[projectId]/copilot/components/actions.tsx
index 9f1c3bdc..001bb89c 100644
--- a/apps/rowboat/app/projects/[projectId]/copilot/components/actions.tsx
+++ b/apps/rowboat/app/projects/[projectId]/copilot/components/actions.tsx
@@ -51,9 +51,12 @@ export function Action({
     const appliedFields = Object.keys(action.config_changes).filter(key => 
         appliedChanges[getAppliedChangeKey(msgIndex, actionIndex, key)]
     );
-    const allApplied = externallyApplied || Object.keys(action.config_changes).every(key => 
+    let allApplied = externallyApplied || Object.keys(action.config_changes).every(key =>
         appliedFields.includes(key)
     );
+    if (!externallyApplied && (action.action === "delete" || action.config_type === 'start_agent')) {
+        allApplied = false;
+    }
 
     // Handle applying a single field change
     const handleFieldChange = (field: string) => {
@@ -160,7 +163,8 @@ export function Action({
         'transition-shadow duration-150',
         {
             'border-l-2 border-l-blue-500': !stale && !allApplied && action.action == 'create_new',
-            'border-l-2 border-l-orange-500': !stale && !allApplied && action.action == 'edit',
+            'border-l-2 border-l-yellow-500': !stale && !allApplied && action.action == 'edit',
+            'border-l-2 border-l-red-500': !stale && !allApplied && action.action == 'delete',
             'border-l-2 border-l-gray-400': stale || allApplied || action.error,
         }
     )}>
@@ -171,14 +175,15 @@ export function Action({
                     'inline-flex items-center justify-center rounded-full h-5 w-5 text-xs',
                     {
                         'bg-blue-100 text-blue-600': action.action == 'create_new',
-                        'bg-orange-100 text-orange-600': action.action == 'edit',
+                        'bg-yellow-100 text-yellow-600': action.action == 'edit',
+                        'bg-red-100 text-red-600': action.action == 'delete',
                         'bg-gray-200 text-gray-600': stale || allApplied || action.error,
                     }
                 )}>
-                    {action.config_type === 'agent' ? '🧑‍💼' : action.config_type === 'tool' ? '🛠️' : action.config_type === 'pipeline' ? '⚙️' : '💬'}
+                    {action.config_type === 'agent' ? '🧑‍💼' : action.config_type === 'tool' ? '🛠️' : action.config_type === 'pipeline' ? '⚙️' : action.config_type === 'start_agent' ? '🏁' : action.config_type === 'prompt' ? '💬' : '💬'}
                 </span>
                 <span className="font-semibold text-sm text-zinc-800 dark:text-zinc-100 truncate flex-1">
-                    {action.action === 'create_new' ? 'Add' : 'Edit'} {action.config_type}: {action.name}
+                    {action.action === 'create_new' ? 'Add' : action.action === 'edit' ? 'Edit' : 'Delete'} {action.config_type}: {action.name}
                 </span>
                 {/* Action buttons - compact, icon only, show text on hover */}
                 <div className="flex items-center gap-1">
@@ -195,13 +200,13 @@ export function Action({
                         <CheckIcon size={13} className={allApplied ? 'text-zinc-400' : 'text-green-600 group-hover:text-green-700'} />
                         <span>{allApplied ? 'Applied' : 'Apply'}</span>
                     </button>
-                    <button
+                    {action.action !== 'delete' && <button
                         className="flex items-center gap-1 rounded-full px-2 h-7 text-xs font-medium bg-transparent text-indigo-600 hover:text-indigo-700 transition-colors"
                         onClick={handleViewDiff}
                     >
                         <EyeIcon size={13} className="text-indigo-600 group-hover:text-indigo-700" />
                         <span>View Diff</span>
-                    </button>
+                    </button>}
                 </div>
             </div>
             {/* Description of what happened */}
@@ -341,8 +346,8 @@ export function StreamingAction({
     loading,
 }: {
     action: {
-        action?: 'create_new' | 'edit';
-        config_type?: 'tool' | 'agent' | 'prompt' | 'pipeline';
+        action?: 'create_new' | 'edit' | 'delete';
+        config_type?: 'tool' | 'agent' | 'prompt' | 'pipeline' | 'start_agent';
         name?: string;
     };
     loading: boolean;
@@ -354,7 +359,8 @@ export function StreamingAction({
             'transition-shadow duration-150',
             {
                 'border-l-2 border-l-blue-500': action.action == 'create_new',
-                'border-l-2 border-l-orange-500': action.action == 'edit',
+                'border-l-2 border-l-yellow-500': action.action == 'edit',
+                'border-l-2 border-l-red-500': action.action == 'delete',
                 'border-l-2 border-l-gray-400': !action.action,
             }
         )}>
@@ -364,14 +370,15 @@ export function StreamingAction({
                     'inline-flex items-center justify-center rounded-full h-5 w-5 text-xs',
                     {
                         'bg-blue-100 text-blue-600': action.action == 'create_new',
-                        'bg-orange-100 text-orange-600': action.action == 'edit',
+                        'bg-yellow-100 text-yellow-600': action.action == 'edit',
+                        'bg-red-100 text-red-600': action.action == 'delete',
                         'bg-gray-200 text-gray-600': !action.action,
                     }
                 )}>
-                    {action.config_type === 'agent' ? '🧑‍💼' : action.config_type === 'tool' ? '🛠️' : action.config_type === 'pipeline' ? '⚙️' : '💬'}
+                    {action.config_type === 'agent' ? '🧑‍💼' : action.config_type === 'tool' ? '🛠️' : action.config_type === 'pipeline' ? '⚙️' : action.config_type === 'start_agent' ? '🏁' : '💬'}
                 </span>
                 <span className="font-semibold text-sm text-zinc-800 dark:text-zinc-100 truncate flex-1">
-                    {action.action === 'create_new' ? 'Add' : 'Edit'} {action.config_type}: {action.name}
+                    {action.action === 'create_new' ? 'Add' : action.action === 'edit' ? 'Edit' : 'Delete'} {action.config_type}: {action.name}
                 </span>
             </div>
             {/* Loading state body */}
diff --git a/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx b/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx
index 54fcf160..563bf798 100644
--- a/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx
+++ b/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx
@@ -70,8 +70,8 @@ function enrich(response: string): z.infer<typeof CopilotResponsePart> {
                 return {
                     type: 'action',
                     action: {
-                        action: metadata.action as 'create_new' | 'edit',
-                        config_type: metadata.config_type as 'tool' | 'agent' | 'prompt' | 'pipeline',
+                        action: metadata.action as 'create_new' | 'edit' | 'delete',
+                        config_type: metadata.config_type as 'tool' | 'agent' | 'prompt' | 'pipeline' | 'start_agent',
                         name: metadata.name,
                         change_description: jsonData.change_description || '',
                         config_changes: {},
@@ -83,8 +83,8 @@ function enrich(response: string): z.infer<typeof CopilotResponsePart> {
             return {
                 type: 'action',
                 action: {
-                    action: metadata.action as 'create_new' | 'edit',
-                    config_type: metadata.config_type as 'tool' | 'agent' | 'prompt' | 'pipeline',
+                    action: metadata.action as 'create_new' | 'edit' | 'delete',
+                    config_type: metadata.config_type as 'tool' | 'agent' | 'prompt' | 'pipeline' | 'start_agent',
                     name: metadata.name,
                     change_description: jsonData.change_description || '',
                     config_changes: result.changes
@@ -99,8 +99,8 @@ function enrich(response: string): z.infer<typeof CopilotResponsePart> {
     return {
         type: 'streaming_action',
         action: {
-            action: (metadata.action as 'create_new' | 'edit') || undefined,
-            config_type: (metadata.config_type as 'tool' | 'agent' | 'prompt' | 'pipeline') || undefined,
+            action: (metadata.action as 'create_new' | 'edit' | 'delete') || undefined,
+            config_type: (metadata.config_type as 'tool' | 'agent' | 'prompt' | 'pipeline' | 'start_agent') || undefined,
             name: metadata.name
         }
     };
@@ -289,6 +289,39 @@ function AssistantMessage({
                         pipeline: action.config_changes
                     });
                     break;
+                case 'start_agent':
+                    dispatch({
+                        type: 'set_main_agent',
+                        name: action.name,
+                    })
+                    break;
+            }
+        } else if (action.action === 'delete') {
+            switch (action.config_type) {
+                case 'agent':
+                    dispatch({
+                        type: 'delete_agent',
+                        name: action.name
+                    });
+                    break;
+                case 'tool':
+                    dispatch({
+                        type: 'delete_tool',
+                        name: action.name
+                    });
+                    break;
+                case 'prompt':
+                    dispatch({
+                        type: 'delete_prompt',
+                        name: action.name
+                    });
+                    break;
+                case 'pipeline':
+                    dispatch({
+                        type: 'delete_pipeline',
+                        name: action.name
+                    });
+                    break;
             }
         }
     }, [dispatch, workflow.agents, workflow.tools]);
diff --git a/apps/rowboat/src/application/lib/copilot/example_multi_agent_1.ts b/apps/rowboat/src/application/lib/copilot/example_multi_agent_1.ts
index 5aef81e3..946e48b7 100644
--- a/apps/rowboat/src/application/lib/copilot/example_multi_agent_1.ts
+++ b/apps/rowboat/src/application/lib/copilot/example_multi_agent_1.ts
@@ -990,4 +990,92 @@ This workflow is now ready. Once you apply the changes, it will automatically ha
 
 ---
 
+### Example 7: Setting the start agent
+
+**User Request**
+Can you set the start agent to the Meeting Prep Hub?
+
+**Copilot Response**
+
+Yes, I can set the start agent to the Meeting Prep Hub.
+
+\`\`\`copilot_change
+
+// action: edit
+// config_type: start_agent
+// name: Meeting Prep Hub
+{
+  "change_description": "Set the start agent to the Meeting Prep Hub.",
+  "config_changes": {},
+}
+\`\`\`
+
+
+---
+
+### Example 8: Delete an agent
+
+**User Request:**
+Can you delete the Slack Send Agent?
+
+**Copilot Response:**
+
+Yes, I can delete the Slack Send Agent.
+
+\`\`\`copilot_change
+// action: delete
+// config_type: agent
+// name: Slack Send Agent
+{
+  "change_description": "Delete the Slack Send Agent.",
+  "config_changes": {},
+  }
+}
+\`\`\`
+
+---
+
+### Example 9: Delete a tool
+
+**User Request:**
+Can you delete the Search tool?
+
+**Copilot Response:**
+
+Yes, I can delete the Search tool.
+
+
+\`\`\`copilot_change
+// action: delete
+// config_type: tool
+// name: Search
+{
+  "change_description": "Delete the Search tool.",
+  "config_changes": {},
+}
+\`\`\`
+
+---
+
+### Example 10: Delete a pipeline
+
+**User Request:**
+Can you delete the Meeting Prep Pipeline?
+
+**Copilot Response:**
+
+Yes, I can delete the Meeting Prep Pipeline.
+
+\`\`\`copilot_change
+// action: delete
+// config_type: pipeline
+// name: Meeting Prep Pipeline
+{
+  "change_description": "Delete the Meeting Prep Pipeline.",
+  "config_changes": {},
+}
+\`\`\`
+
+---
+
 `;
\ No newline at end of file
diff --git a/apps/rowboat/src/application/lib/copilot/types.ts b/apps/rowboat/src/application/lib/copilot/types.ts
index 5d42b0e8..5b54f9dc 100644
--- a/apps/rowboat/src/application/lib/copilot/types.ts
+++ b/apps/rowboat/src/application/lib/copilot/types.ts
@@ -21,8 +21,8 @@ export const CopilotAssistantMessageTextPart = z.object({
 export const CopilotAssistantMessageActionPart = z.object({
     type: z.literal("action"),
     content: z.object({
-        config_type: z.union([z.literal('tool'), z.literal('agent'), z.literal('prompt'), z.literal('pipeline')]),
-        action: z.union([z.literal('create_new'), z.literal('edit')]),
+        config_type: z.enum(['tool', 'agent', 'prompt', 'pipeline', 'start_agent']),
+        action: z.enum(['create_new', 'edit', 'delete']),
         name: z.string(),
         change_description: z.string(),
         config_changes: z.record(z.string(), z.unknown()),

From 291943cdd57f8e89a62fffd9f7975327065f0621 Mon Sep 17 00:00:00 2001
From: akhisud3195 <akhileshs.s4@gmail.com>
Date: Thu, 21 Aug 2025 08:48:57 +0530
Subject: [PATCH 05/15] Fix copilot welcome screen component overlay

---
 .../app/projects/[projectId]/copilot/app.tsx  | 54 ++++++++++++++++++-
 .../copilot/components/messages.tsx           |  2 +-
 .../components/common/panel-common.tsx        | 54 ++-----------------
 3 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/apps/rowboat/app/projects/[projectId]/copilot/app.tsx b/apps/rowboat/app/projects/[projectId]/copilot/app.tsx
index 859aea90..538b6070 100644
--- a/apps/rowboat/app/projects/[projectId]/copilot/app.tsx
+++ b/apps/rowboat/app/projects/[projectId]/copilot/app.tsx
@@ -14,6 +14,9 @@ import { Messages } from "./components/messages";
 import { CopyIcon, CheckIcon, PlusIcon, XIcon, InfoIcon, Sparkles } from "lucide-react";
 import { useCopilot } from "./use-copilot";
 import { BillingUpgradeModal } from "@/components/common/billing-upgrade-modal";
+import { SHOW_COPILOT_MARQUEE } from "@/app/lib/feature_flags";
+import Image from "next/image";
+import mascot from "@/public/mascot.png";
 
 const CopilotContext = createContext<{
     workflow: z.infer<typeof Workflow> | null;
@@ -205,6 +208,56 @@ const App = forwardRef<{ handleCopyChat: () => void; handleUserMessage: (message
         <CopilotContext.Provider value={{ workflow: workflowRef.current, dispatch }}>
             <div className="h-full flex flex-col">
                 <div className="flex-1 overflow-auto">
+                    {messages.length === 0 && (
+                        <div className="flex flex-col items-center justify-center py-4 pointer-events-none">
+                            {/* Replace Sparkles icon with mascot image */}
+                            <Image src={mascot} alt="Rowboat Mascot" width={160} height={160} className="object-contain mb-3 animate-float" />
+                            
+                            {/* Welcome/Intro Section */}
+                            <div className="text-center max-w-md px-6 mb-3">
+                                <h3 className="text-xl font-semibold text-zinc-700 dark:text-zinc-300 mb-2 text-center">
+                                    👋 Welcome to Rowboat!
+                                </h3>
+                                <p className="text-base text-zinc-600 dark:text-zinc-400 mb-4 text-center">
+                                    I&apos;m your copilot for building agents and adding tools to them.
+                                </p>
+                                <p className="text-base text-zinc-600 dark:text-zinc-400 mb-3 text-center">
+                                    Here&apos;s what you can do in Rowboat:
+                                </p>
+                                <div className="space-y-2 max-w-2xl mx-auto text-left">
+                                    <div className="flex items-start gap-3">
+                                        <span className="text-lg">⚡</span>
+                                        <span className="text-sm text-zinc-600 dark:text-zinc-400">Build AI agents instantly with natural language.</span>
+                                    </div>
+                                    <div className="flex items-start gap-3">
+                                        <span className="text-lg">🔌</span>
+                                        <span className="text-sm text-zinc-600 dark:text-zinc-400">Connect tools with one-click integrations.</span>
+                                    </div>
+                                    <div className="flex items-start gap-3">
+                                        <span className="text-lg">📂</span>
+                                        <span className="text-sm text-zinc-600 dark:text-zinc-400">Power with knowledge by adding documents for RAG.</span>
+                                    </div>
+                                    <div className="flex items-start gap-3">
+                                        <span className="text-lg">🔄</span>
+                                        <span className="text-sm text-zinc-600 dark:text-zinc-400">Automate workflows by setting up triggers and actions.</span>
+                                    </div>
+                                    <div className="flex items-start gap-3">
+                                        <span className="text-lg">🚀</span>
+                                        <span className="text-sm text-zinc-600 dark:text-zinc-400">Deploy anywhere via API or SDK.</span>
+                                    </div>
+                                </div>
+                            </div>
+                            
+                            {SHOW_COPILOT_MARQUEE && (
+                                <div className="relative mt-2 max-w-full px-8">
+                                    <div className="font-mono text-sm whitespace-nowrap text-blue-400/60 dark:text-blue-500/40 font-small inline-flex">
+                                        <div className="overflow-hidden w-0 animate-typing">What can I help you build?</div>
+                                        <div className="border-r-2 border-blue-400 dark:border-blue-500 animate-cursor">&nbsp;</div>
+                                    </div>
+                                </div>
+                            )}
+                        </div>
+                    )}
                     <Messages
                         messages={messages}
                         streamingResponse={streamingResponse}
@@ -320,7 +373,6 @@ export const Copilot = forwardRef<{ handleUserMessage: (message: string) => void
             <Panel 
                 variant="copilot"
                 tourTarget="copilot"
-                showWelcome={messages.length === 0}
                 icon={<Sparkles className="w-5 h-5 text-indigo-600 dark:text-indigo-400" />}
                 title="Skipper"
                 subtitle="Build your assistant"
diff --git a/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx b/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx
index 563bf798..2b891084 100644
--- a/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx
+++ b/apps/rowboat/app/projects/[projectId]/copilot/components/messages.tsx
@@ -575,7 +575,7 @@ export function Messages({
     };
 
     return (
-        <div className="h-full">
+        <div className={displayMessages.length === 0 ? "" : "h-full"}>
             <div className="flex flex-col mb-4">
                 {displayMessages.map((message, index) => (
                     <div key={index} className="mb-4">
diff --git a/apps/rowboat/components/common/panel-common.tsx b/apps/rowboat/components/common/panel-common.tsx
index 1ceb8208..3ee7875f 100644
--- a/apps/rowboat/components/common/panel-common.tsx
+++ b/apps/rowboat/components/common/panel-common.tsx
@@ -81,56 +81,6 @@ export function Panel({
         onClick={onClick}
         data-tour-target={tourTarget}
     >
-        {variant === 'copilot' && showWelcome && (
-            <div className="absolute inset-0 flex flex-col items-center justify-center pointer-events-none -mt-8">
-                {/* Replace Sparkles icon with mascot image */}
-                <Image src={mascot} alt="Rowboat Mascot" width={192} height={192} className="object-contain mb-4 animate-float" />
-                
-                {/* Welcome/Intro Section */}
-                <div className="text-center max-w-md px-6 mb-4">
-                                         <h3 className="text-xl font-semibold text-zinc-700 dark:text-zinc-300 mb-3 text-center">
-                         👋 Welcome to Rowboat!
-                     </h3>
-                                              <p className="text-base text-zinc-600 dark:text-zinc-400 mb-6 text-center">
-                             I&apos;m your copilot for building agents and adding tools to them.
-                         </p>
-                         <p className="text-base text-zinc-600 dark:text-zinc-400 mb-4 text-center">
-                             Here&apos;s what you can do in Rowboat:
-                         </p>
-                     <div className="space-y-3 max-w-2xl mx-auto text-left">
-                         <div className="flex items-start gap-3">
-                             <span className="text-lg">⚡</span>
-                             <span className="text-sm text-zinc-600 dark:text-zinc-400">Build AI agents instantly with natural language.</span>
-                         </div>
-                         <div className="flex items-start gap-3">
-                             <span className="text-lg">🔌</span>
-                             <span className="text-sm text-zinc-600 dark:text-zinc-400">Connect tools with one-click integrations.</span>
-                         </div>
-                         <div className="flex items-start gap-3">
-                             <span className="text-lg">📂</span>
-                             <span className="text-sm text-zinc-600 dark:text-zinc-400">Power with knowledge by adding documents for RAG.</span>
-                         </div>
-                         <div className="flex items-start gap-3">
-                             <span className="text-lg">🔄</span>
-                             <span className="text-sm text-zinc-600 dark:text-zinc-400">Automate workflows by setting up triggers and actions.</span>
-                         </div>
-                         <div className="flex items-start gap-3">
-                             <span className="text-lg">🚀</span>
-                             <span className="text-sm text-zinc-600 dark:text-zinc-400">Deploy anywhere via API or SDK.</span>
-                         </div>
-                     </div>
-                </div>
-                
-                {SHOW_COPILOT_MARQUEE && (
-                    <div className="relative mt-4 max-w-full px-8">
-                        <div className="font-mono text-sm whitespace-nowrap text-blue-400/60 dark:text-blue-500/40 font-small inline-flex">
-                            <div className="overflow-hidden w-0 animate-typing">What can I help you build?</div>
-                            <div className="border-r-2 border-blue-400 dark:border-blue-500 animate-cursor">&nbsp;</div>
-                        </div>
-                    </div>
-                )}
-            </div>
-        )}
         <div 
             className={clsx(
                 "shrink-0 border-b relative",
@@ -207,7 +157,9 @@ export function Panel({
                 <div className="px-4 py-3">
                     {children}
                 </div>
-            ) : children}
+            ) : (
+                children
+            )}
         </div>
     </div>;
 }
\ No newline at end of file

From 4876b8e818767407f7abd3cb3d8ebbc76778fe81 Mon Sep 17 00:00:00 2001
From: akhisud3195 <akhileshs.s4@gmail.com>
Date: Thu, 21 Aug 2025 09:08:34 +0530
Subject: [PATCH 06/15] Re-route help button to discord

---
 .../projects/layout/components/sidebar.tsx    | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/apps/rowboat/app/projects/layout/components/sidebar.tsx b/apps/rowboat/app/projects/layout/components/sidebar.tsx
index 739d3821..1713a74f 100644
--- a/apps/rowboat/app/projects/layout/components/sidebar.tsx
+++ b/apps/rowboat/app/projects/layout/components/sidebar.tsx
@@ -256,24 +256,27 @@ export default function Sidebar({ projectId, useAuth, collapsed = false, onToggl
 
           {/* Theme and Auth Controls */}
           <div className="p-3 border-t border-zinc-100 dark:border-zinc-800 space-y-2">
-            {USE_PRODUCT_TOUR && !isProjectsRoute && (
-              <Tooltip content={collapsed ? "Help" : ""} showArrow placement="right">
-                <button
-                  onClick={showHelpModal}
-                  className={`
-                    w-full rounded-md flex items-center
-                    text-[15px] font-medium transition-all duration-200
-                    ${collapsed ? 'justify-center py-4' : 'px-4 py-4 gap-3'}
-                    hover:bg-zinc-100 dark:hover:bg-zinc-800/50
-                    text-zinc-600 dark:text-zinc-400
-                  `}
-                  data-tour-target="tour-button"
-                >
-                  <HelpCircle size={COLLAPSED_ICON_SIZE} />
-                  {!collapsed && <span>Help</span>}
-                </button>
-              </Tooltip>
-            )}
+            {/* Help button - always visible, but behavior depends on feature flag */}
+            <Tooltip content={collapsed ? "Help" : ""} showArrow placement="right">
+              <button
+                onClick={USE_PRODUCT_TOUR ? showHelpModal : () => {
+                  // Basic help behavior when tour is disabled
+                  // You can customize this to show a different help modal or redirect
+                  window.open('https://discord.com/invite/rxB8pzHxaS', '_blank');
+                }}
+                className={`
+                  w-full rounded-md flex items-center
+                  text-[15px] font-medium transition-all duration-200
+                  ${collapsed ? 'justify-center py-4' : 'px-4 py-4 gap-3'}
+                  hover:bg-zinc-100 dark:hover:bg-zinc-800/50
+                  text-zinc-600 dark:text-zinc-400
+                `}
+                data-tour-target="tour-button"
+              >
+                <HelpCircle size={COLLAPSED_ICON_SIZE} />
+                {!collapsed && <span>Help</span>}
+              </button>
+            </Tooltip>
 
             {SHOW_DARK_MODE_TOGGLE && (
               <Tooltip content={collapsed ? "Appearance" : ""} showArrow placement="right">

From e68da3de21bb8674a8805562882febd72b3131c8 Mon Sep 17 00:00:00 2001
From: akhisud3195 <akhileshs.s4@gmail.com>
Date: Thu, 21 Aug 2025 09:49:24 +0530
Subject: [PATCH 07/15] Move agent name to header of agent config

---
 .../[projectId]/entities/agent_config.tsx     | 108 +++++++++++-------
 1 file changed, 67 insertions(+), 41 deletions(-)

diff --git a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
index f44432f4..0ccf3435 100644
--- a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
+++ b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
@@ -2,10 +2,10 @@
 import { WorkflowPrompt, WorkflowAgent, Workflow, WorkflowTool } from "../../../lib/types/workflow_types";
 import { DataSource } from "@/src/entities/models/data-source";
 import { z } from "zod";
-import { PlusIcon, X as XIcon, ChevronDown, ChevronRight, Trash2, Maximize2, Minimize2, StarIcon, DatabaseIcon, UserIcon, Settings, Info } from "lucide-react";
+import { PlusIcon, X as XIcon, ChevronDown, ChevronRight, Trash2, Maximize2, Minimize2, StarIcon, DatabaseIcon, UserIcon, Settings, Info, Edit3 } from "lucide-react";
 import { useState, useEffect, useRef } from "react";
 import { usePreviewModal } from "../workflow/preview-modal";
-import { Modal, ModalContent, ModalHeader, ModalBody, ModalFooter, Select, SelectItem, Chip, SelectSection } from "@heroui/react";
+import { Modal, ModalContent, ModalHeader, ModalBody, ModalFooter, Select, SelectItem, Chip, SelectSection, Input } from "@heroui/react";
 import { PreviewModalProvider } from "../workflow/preview-modal";
 import { CopilotMessage } from "@/src/application/lib/copilot/types";
 import { getCopilotAgentInstructions } from "@/app/actions/copilot.actions";
@@ -17,7 +17,6 @@ import { Button as CustomButton } from "@/components/ui/button";
 import clsx from "clsx";
 import { InputField } from "@/app/lib/components/input-field";
 import { USE_TRANSFER_CONTROL_OPTIONS } from "@/app/lib/feature_flags";
-import { Input } from "@/components/ui/input";
 import { Info as InfoIcon } from "lucide-react";
 import { useCopilot } from "../copilot/use-copilot";
 import { BillingUpgradeModal } from "@/components/common/billing-upgrade-modal";
@@ -78,6 +77,8 @@ export function AgentConfig({
     const [previousRagSources, setPreviousRagSources] = useState<string[]>([]);
     const [billingError, setBillingError] = useState<string | null>(null);
     const [showSavedBanner, setShowSavedBanner] = useState(false);
+    const [isEditingName, setIsEditingName] = useState(false);
+    const nameInputRef = useRef<HTMLInputElement>(null);
 
     // Check if this agent is a pipeline agent
     const isPipelineAgent = agent.type === 'pipeline';
@@ -101,6 +102,14 @@ export function AgentConfig({
         setLocalName(agent.name);
     }, [agent.name]);
 
+    // Focus name input when entering edit mode
+    useEffect(() => {
+        if (isEditingName && nameInputRef.current) {
+            nameInputRef.current.focus();
+            nameInputRef.current.select();
+        }
+    }, [isEditingName]);
+
     // Track changes in RAG datasources
     useEffect(() => {
         const currentSources = agent.ragDataSources || [];
@@ -188,15 +197,36 @@ export function AgentConfig({
         return true;
     };
 
-    const handleNameChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         const newName = e.target.value;
         setLocalName(newName);
-        
-        if (validateName(newName)) {
+        setNameError(null);
+    };
+
+    const handleNameCommit = () => {
+        if (validateName(localName)) {
             handleUpdate({
                 ...agent,
-                name: newName
+                name: localName
             });
+            showSavedMessage();
+            setIsEditingName(false);
+        }
+    };
+
+    const handleNameCancel = () => {
+        setLocalName(agent.name);
+        setNameError(null);
+        setIsEditingName(false);
+    };
+
+    const handleNameKeyDown = (e: React.KeyboardEvent) => {
+        if (e.key === 'Enter') {
+            e.preventDefault();
+            handleNameCommit();
+        } else if (e.key === 'Escape') {
+            e.preventDefault();
+            handleNameCancel();
         }
     };
 
@@ -221,8 +251,36 @@ export function AgentConfig({
         <Panel 
             title={
                 <div className="flex items-center justify-between w-full">
-                    <div className="text-base font-semibold text-gray-900 dark:text-gray-100">
-                        {agent.name}
+                    <div className="flex items-center gap-2 flex-1 min-w-0">
+                        {isEditingName ? (
+                            <div className="flex flex-col min-w-0 flex-1">
+                                <Input
+                                    ref={nameInputRef}
+                                    type="text"
+                                    value={localName}
+                                    onChange={handleNameChange}
+                                    onKeyDown={handleNameKeyDown}
+                                    onBlur={handleNameCommit}
+                                    isInvalid={!!nameError}
+                                    errorMessage={nameError}
+                                    variant="bordered"
+                                    size="sm"
+                                    classNames={{
+                                        base: "max-w-xs",
+                                        input: "text-base font-semibold px-2",
+                                        inputWrapper: "min-h-[28px] h-[28px] border-gray-200 dark:border-gray-700 px-0"
+                                    }}
+                                />
+                            </div>
+                        ) : (
+                            <button
+                                onClick={() => setIsEditingName(true)}
+                                className="flex items-center gap-2 text-base font-semibold text-gray-900 dark:text-gray-100 hover:bg-gray-100 dark:hover:bg-gray-800 px-2 py-1 rounded-md transition-colors group"
+                            >
+                                <span className="truncate">{agent.name}</span>
+                                <Edit3 className="w-4 h-4 text-gray-400 group-hover:text-gray-600 dark:group-hover:text-gray-300 transition-colors" />
+                            </button>
+                        )}
                     </div>
                     <CustomButton
                         variant="secondary"
@@ -480,38 +538,6 @@ export function AgentConfig({
 
                     {activeTab === 'configurations' && (
                         <div className="flex flex-col gap-4 pb-4 pt-0">
-                            {/* Identity Section Card */}
-                            <SectionCard
-                                icon={<UserIcon className="w-5 h-5 text-indigo-500" />}
-                                title="Identity"
-                                labelWidth="md:w-32"
-                                className="mb-1"
-                            >
-                                <div className="flex flex-col gap-6">
-                                    <div className="flex flex-col md:flex-row md:items-start gap-1 md:gap-0">
-                                        <label className="text-sm font-semibold text-gray-600 dark:text-gray-300 md:w-32 mb-1 md:mb-0 md:pr-4">Name</label>
-                                        <div className="flex-1">
-                                            <InputField
-                                                type="text"
-                                                value={localName}
-                                                onChange={(value) => {
-                                                    setLocalName(value);
-                                                    if (validateName(value)) {
-                                                        handleUpdate({
-                                                            ...agent,
-                                                            name: value
-                                                        });
-                                                    }
-                                                    showSavedMessage();
-                                                }}
-                                                error={nameError}
-                                                className="w-full"
-                                            />
-                                        </div>
-                                    </div>
-
-                                </div>
-                            </SectionCard>
                             {/* Behavior Section Card */}
                             <SectionCard
                                 icon={<Settings className="w-5 h-5 text-indigo-500" />}

From ab0049d9ba67514480f5be33bee0304cae904dab Mon Sep 17 00:00:00 2001
From: akhisud3195 <akhileshs.s4@gmail.com>
Date: Thu, 21 Aug 2025 09:58:28 +0530
Subject: [PATCH 08/15] Update configurations tab name and remove max calls
 from parent

---
 .../[projectId]/entities/agent_config.tsx     | 55 ++++---------------
 1 file changed, 10 insertions(+), 45 deletions(-)

diff --git a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
index 0ccf3435..15abca57 100644
--- a/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
+++ b/apps/rowboat/app/projects/[projectId]/entities/agent_config.tsx
@@ -158,6 +158,13 @@ export function AgentConfig({
         }
     }, [agent.controlType, agent.outputVisibility, agent, handleUpdate]);
 
+    // Add effect to ensure internal agents have maxCallsPerParentAgent set to 1 by default
+    useEffect(() => {
+        if (agent.outputVisibility === "internal" && !isPipelineAgent && agent.maxCallsPerParentAgent === undefined) {
+            handleUpdate({ ...agent, maxCallsPerParentAgent: 1 });
+        }
+    }, [agent.outputVisibility, agent.maxCallsPerParentAgent, agent, handleUpdate, isPipelineAgent]);
+
     // Add effect to handle escape key
     useEffect(() => {
         const handleEscape = (e: KeyboardEvent) => {
@@ -239,13 +246,7 @@ export function AgentConfig({
         currentAgent: agent
     });
 
-    // Add local state for max calls input
-    const [maxCallsInput, setMaxCallsInput] = useState(String(agent.maxCallsPerParentAgent || 3));
-    const [maxCallsError, setMaxCallsError] = useState<string | null>(null);
-    // Sync local state with agent prop
-    useEffect(() => {
-      setMaxCallsInput(String(agent.maxCallsPerParentAgent || 3));
-    }, [agent.maxCallsPerParentAgent]);
+
 
     return (
         <Panel 
@@ -318,7 +319,7 @@ export function AgentConfig({
                                     : "text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-300"
                             )}
                         >
-                            {tab.charAt(0).toUpperCase() + tab.slice(1)}
+                            {tab === 'instructions' ? 'Instructions' : 'Model & RAG'}
                         </button>
                     ))}
                 </div>
@@ -644,43 +645,7 @@ export function AgentConfig({
                                             }
                                         </div>
                                     </div>
-                                    {agent.outputVisibility === "internal" && !isPipelineAgent && (
-                                        <div className="flex flex-col md:flex-row md:items-start gap-1 md:gap-0">
-                                            <label className="text-sm font-semibold text-gray-600 dark:text-gray-300 md:w-32 mb-1 md:mb-0 md:pr-4">Max Calls From Parent</label>
-                                            <div className="flex-1">
-                                                <InputField
-                                                    type="number"
-                                                    value={maxCallsInput}
-                                                    onChange={(value: string) => {
-                                                        setMaxCallsInput(value);
-                                                        setMaxCallsError(null);
-                                                        const num = Number(value);
-                                                        if (value && !isNaN(num) && num >= 1 && Number.isInteger(num)) {
-                                                            if (num !== agent.maxCallsPerParentAgent) {
-                                                                handleUpdate({
-                                                                    ...agent,
-                                                                    maxCallsPerParentAgent: num
-                                                                });
-                                                            }
-                                                        }
-                                                    }}
-                                                    validate={(value: string) => {
-                                                        const num = Number(value);
-                                                        if (!value || isNaN(num) || num < 1 || !Number.isInteger(num)) {
-                                                            return { valid: false, errorMessage: "Must be an integer >= 1" };
-                                                        }
-                                                        return { valid: true };
-                                                    }}
-                                                    error={maxCallsError}
-                                                    min={1}
-                                                    className="w-full max-w-24"
-                                                />
-                                                {maxCallsError && (
-                                                    <p className="text-sm text-red-500 mt-1">{maxCallsError}</p>
-                                                )}
-                                            </div>
-                                        </div>
-                                    )}
+
                                     {USE_TRANSFER_CONTROL_OPTIONS && !isPipelineAgent && (
                                         <div className="flex flex-col md:flex-row md:items-start gap-1 md:gap-0">
                                             <label className="text-sm font-semibold text-gray-600 dark:text-gray-300 md:w-32 mb-1 md:mb-0 md:pr-4">After Turn</label>

From 981cff3b3f47c02280baac35202ea4a46eae21df Mon Sep 17 00:00:00 2001
From: akhisud3195 <akhileshs.s4@gmail.com>
Date: Thu, 21 Aug 2025 10:15:28 +0530
Subject: [PATCH 09/15] Update copilot welcome message

---
 apps/rowboat/app/projects/[projectId]/copilot/app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/rowboat/app/projects/[projectId]/copilot/app.tsx b/apps/rowboat/app/projects/[projectId]/copilot/app.tsx
index 538b6070..fc9675fe 100644
--- a/apps/rowboat/app/projects/[projectId]/copilot/app.tsx
+++ b/apps/rowboat/app/projects/[projectId]/copilot/app.tsx
@@ -216,7 +216,7 @@ const App = forwardRef<{ handleCopyChat: () => void; handleUserMessage: (message
                             {/* Welcome/Intro Section */}
                             <div className="text-center max-w-md px-6 mb-3">
                                 <h3 className="text-xl font-semibold text-zinc-700 dark:text-zinc-300 mb-2 text-center">
-                                    👋 Welcome to Rowboat!
+                                    👋 Hi there!
                                 </h3>
                                 <p className="text-base text-zinc-600 dark:text-zinc-400 mb-4 text-center">
                                     I&apos;m your copilot for building agents and adding tools to them.

From ab014f788cd162af840948c585d9c081cb234ce3 Mon Sep 17 00:00:00 2001
From: arkml <arkm85@gmail.com>
Date: Thu, 21 Aug 2025 17:29:27 +0530
Subject: [PATCH 10/15] Context variables (#214)

* move prompts panel to variables

* variable shows both name and value

* added modal to add variables

* removed warning on edits

* adding or updating variables only uses the modal

* append variable context to agent instructions

* add dummy value to the variable values when downloading json

* fixed @variable mentions in the instruction editor

* change placeholder text for variables when json is imported
---
 apps/rowboat/app/lib/components/atmentions.ts |   8 +-
 apps/rowboat/app/lib/feature_flags.ts         |   2 +-
 apps/rowboat/app/lib/types/workflow_types.ts  |  14 +-
 .../[projectId]/entities/prompt_config.tsx    |   9 +-
 .../[projectId]/workflow/entity_list.tsx      | 210 +++++++++++++++++-
 .../[projectId]/workflow/workflow_editor.tsx  | 104 ++++++++-
 .../lib/agents-runtime/agent_instructions.ts  |  22 +-
 .../application/lib/agents-runtime/agents.ts  |  12 +-
 8 files changed, 358 insertions(+), 23 deletions(-)

diff --git a/apps/rowboat/app/lib/components/atmentions.ts b/apps/rowboat/app/lib/components/atmentions.ts
index f1b94712..1b416148 100644
--- a/apps/rowboat/app/lib/components/atmentions.ts
+++ b/apps/rowboat/app/lib/components/atmentions.ts
@@ -55,11 +55,15 @@ export function createAtMentions({ agents, prompts, tools, pipelines = [], curre
 
     // Add prompts (always allowed)
     for (const prompt of prompts) {
-        const id = `prompt:${prompt.name}`;
+        // Use 'variable' for base_prompt types, 'prompt' for others
+        const isVariable = prompt.type === 'base_prompt';
+        const type = isVariable ? 'variable' : 'prompt';
+        const label = isVariable ? 'Variable' : 'Prompt';
+        const id = `${type}:${prompt.name}`;
         atMentions.push({
             id,
             value: id,
-            label: `Prompt: ${prompt.name}`,
+            label: `${label}: ${prompt.name}`,
             denotationChar: "@",
             link: id,
             target: "_self"
diff --git a/apps/rowboat/app/lib/feature_flags.ts b/apps/rowboat/app/lib/feature_flags.ts
index 74d4fa1c..a80df7c6 100644
--- a/apps/rowboat/app/lib/feature_flags.ts
+++ b/apps/rowboat/app/lib/feature_flags.ts
@@ -15,6 +15,6 @@ export const USE_VOICE_FEATURE = false;
 export const USE_TRANSFER_CONTROL_OPTIONS = false;
 export const USE_PRODUCT_TOUR = false;
 export const SHOW_COPILOT_MARQUEE = false;
-export const SHOW_PROMPTS_SECTION = false;
+export const SHOW_PROMPTS_SECTION = true;
 export const SHOW_DARK_MODE_TOGGLE = false;
 export const SHOW_VISUALIZATION = false
\ No newline at end of file
diff --git a/apps/rowboat/app/lib/types/workflow_types.ts b/apps/rowboat/app/lib/types/workflow_types.ts
index 9c75e4c1..8f6b184f 100644
--- a/apps/rowboat/app/lib/types/workflow_types.ts
+++ b/apps/rowboat/app/lib/types/workflow_types.ts
@@ -129,8 +129,8 @@ export function sanitizeTextWithMentions(
     sanitized: string;
     entities: z.infer<typeof ConnectedEntity>[];
 } {
-    // Regex to match [@type:name](#type:something) pattern where type is tool/prompt/agent/pipeline
-    const mentionRegex = /\[@(tool|prompt|agent|pipeline):([^\]]+)\]\(#mention\)/g;
+    // Regex to match [@type:name](#type:something) pattern where type is tool/prompt/agent/pipeline/variable
+    const mentionRegex = /\[@(tool|prompt|agent|pipeline|variable):([^\]]+)\]\(#mention\)/g;
     const seen = new Set<string>();
 
     // collect entities
@@ -144,8 +144,10 @@ export function sanitizeTextWithMentions(
             return true;
         })
         .map(match => {
+            // Treat @variable: as @prompt: internally
+            const type = match[1] === 'variable' ? 'prompt' : match[1];
             return {
-                type: match[1] as 'tool' | 'prompt' | 'agent' | 'pipeline',
+                type: type as 'tool' | 'prompt' | 'agent' | 'pipeline',
                 name: match[2],
             };
         })
@@ -176,6 +178,12 @@ export function sanitizeTextWithMentions(
         const id = `${entity.type}:${entity.name}`;
         const textToReplace = `[@${id}](#mention)`;
         text = text.replace(textToReplace, `[@${id}]`);
+        
+        // Also handle @variable: mentions for prompts
+        if (entity.type === 'prompt') {
+            const variableTextToReplace = `[@variable:${entity.name}](#mention)`;
+            text = text.replace(variableTextToReplace, `[@variable:${entity.name}]`);
+        }
     }
 
     return {
diff --git a/apps/rowboat/app/projects/[projectId]/entities/prompt_config.tsx b/apps/rowboat/app/projects/[projectId]/entities/prompt_config.tsx
index 159bd7b9..1ae2d998 100644
--- a/apps/rowboat/app/projects/[projectId]/entities/prompt_config.tsx
+++ b/apps/rowboat/app/projects/[projectId]/entities/prompt_config.tsx
@@ -14,6 +14,9 @@ const sectionHeaderStyles = "block text-xs font-medium uppercase tracking-wider
 // Enhanced textarea styles with improved states
 const textareaStyles = "rounded-lg p-3 border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 hover:bg-gray-50 dark:hover:bg-gray-750 focus:shadow-inner focus:ring-2 focus:ring-indigo-500/20 dark:focus:ring-indigo-400/20 placeholder:text-gray-400 dark:placeholder:text-gray-500";
 
+// Value field styles without grey placeholder text
+const valueTextareaStyles = "rounded-lg p-3 border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 hover:bg-gray-50 dark:hover:bg-gray-750 focus:shadow-inner focus:ring-2 focus:ring-indigo-500/20 dark:focus:ring-indigo-400/20 placeholder:text-black dark:placeholder:text-white";
+
 export function PromptConfig({
     prompt,
     agents,
@@ -128,7 +131,7 @@ export function PromptConfig({
 
                 <div className="space-y-4">
                     <label className={sectionHeaderStyles}>
-                        Prompt
+                        Value
                     </label>
                     <Textarea
                         value={prompt.prompt}
@@ -139,8 +142,8 @@ export function PromptConfig({
                             });
                             showSavedMessage();
                         }}
-                        placeholder="Edit prompt here..."
-                        className={`${textareaStyles} min-h-[200px]`}
+                        placeholder="Enter variable value..."
+                        className={`${valueTextareaStyles} min-h-[200px]`}
                         autoResize
                     />
                 </div>
diff --git a/apps/rowboat/app/projects/[projectId]/workflow/entity_list.tsx b/apps/rowboat/app/projects/[projectId]/workflow/entity_list.tsx
index 0d35dde5..f939e029 100644
--- a/apps/rowboat/app/projects/[projectId]/workflow/entity_list.tsx
+++ b/apps/rowboat/app/projects/[projectId]/workflow/entity_list.tsx
@@ -63,6 +63,9 @@ interface EntityListProps {
     onAddAgent: (agent: Partial<z.infer<typeof WorkflowAgent>>) => void;
     onAddTool: (tool: Partial<z.infer<typeof WorkflowTool>>) => void;
     onAddPrompt: (prompt: Partial<z.infer<typeof WorkflowPrompt>>) => void;
+    onUpdatePrompt: (name: string, prompt: Partial<z.infer<typeof WorkflowPrompt>>) => void;
+    onAddPromptFromModal: (prompt: Partial<z.infer<typeof WorkflowPrompt>>) => void;
+    onUpdatePromptFromModal: (name: string, prompt: Partial<z.infer<typeof WorkflowPrompt>>) => void;
     onAddPipeline: (pipeline: Partial<z.infer<typeof WorkflowPipeline>>) => void;
     onAddAgentToPipeline: (pipelineName: string) => void;
     onToggleAgent: (name: string) => void;
@@ -97,6 +100,7 @@ const EmptyState: React.FC<EmptyStateProps> = ({ entity, hasFilteredItems }) =>
 
 const ListItemWithMenu = ({ 
     name, 
+    value,
     isSelected, 
     onClick, 
     disabled, 
@@ -110,6 +114,7 @@ const ListItemWithMenu = ({
     isMocked,
 }: {
     name: string;
+    value?: string;
     isSelected?: boolean;
     onClick?: () => void;
     disabled?: boolean;
@@ -157,9 +162,34 @@ const ListItemWithMenu = ({
                         />
                     ) : icon}
                 </div>
-                <span className="text-xs">{name}</span>
+                {value ? (
+                    <div className="flex-1 min-w-0 grid grid-cols-2 gap-2">
+                        <Tooltip 
+                            content={name} 
+                            size="sm" 
+                            delay={500}
+                            isDisabled={name.length <= 20}
+                        >
+                            <span className="text-xs font-medium truncate">
+                                {name}
+                            </span>
+                        </Tooltip>
+                        <Tooltip 
+                            content={value} 
+                            size="sm" 
+                            delay={500}
+                            isDisabled={value.length <= 30}
+                        >
+                            <span className="text-xs text-zinc-600 dark:text-zinc-400 truncate">
+                                {value}
+                            </span>
+                        </Tooltip>
+                    </div>
+                ) : (
+                    <span className="text-xs">{name}</span>
+                )}
             </div>
-            <div className="flex items-center gap-1">
+            <div className="flex items-center gap-1 shrink-0">
                 {statusLabel}
                 {isMocked && (
                     <Tooltip content="Mocked" size="sm" delay={500}>
@@ -168,7 +198,9 @@ const ListItemWithMenu = ({
                         </div>
                     </Tooltip>
                 )}
-                {menuContent}
+                <div className="opacity-100">
+                    {menuContent}
+                </div>
             </div>
         </div>
     );
@@ -464,6 +496,9 @@ export const EntityList = forwardRef<
     onAddAgent,
     onAddTool,
     onAddPrompt,
+    onUpdatePrompt,
+    onAddPromptFromModal,
+    onUpdatePromptFromModal,
     onAddPipeline,
     onAddAgentToPipeline,
     onToggleAgent,
@@ -490,6 +525,8 @@ export const EntityList = forwardRef<
     const [showAgentTypeModal, setShowAgentTypeModal] = useState(false);
     const [showToolsModal, setShowToolsModal] = useState(false);
     const [showDataSourcesModal, setShowDataSourcesModal] = useState(false);
+    const [showAddVariableModal, setShowAddVariableModal] = useState(false);
+    const [editingVariable, setEditingVariable] = useState<{name: string; value: string} | null>(null);
     // State to track which toolkit's tools panel to open
     const [selectedToolkitSlug, setSelectedToolkitSlug] = useState<string | null>(null);
 
@@ -498,6 +535,11 @@ export const EntityList = forwardRef<
             outputVisibility: agentType
         });
     };
+
+    const handleVariableClick = (prompt: z.infer<typeof WorkflowPrompt>) => {
+        setEditingVariable({ name: prompt.name, value: prompt.prompt });
+        setShowAddVariableModal(true);
+    };
     const selectedRef = useRef<HTMLDivElement>(null);
     const containerRef = useRef<HTMLDivElement>(null);
     const [containerHeight, setContainerHeight] = useState<number>(0);
@@ -1146,7 +1188,7 @@ export const EntityList = forwardRef<
                                             )}
                                         </button>
                                         <PenLine className="w-4 h-4" />
-                                        <span>Prompts</span>
+                                        <span>Variables</span>
                                     </div>
                                     <Button
                                         variant="secondary"
@@ -1154,11 +1196,11 @@ export const EntityList = forwardRef<
                                         onClick={(e) => {
                                             e.stopPropagation();
                                             setExpandedPanels(prev => ({ ...prev, prompts: true }));
-                                            onAddPrompt({});
+                                            setShowAddVariableModal(true);
                                         }}
                                         className={`group ${buttonClasses}`}
                                         showHoverContent={true}
-                                        hoverContent="Add Prompt"
+                                        hoverContent="Add Variable"
                                     >
                                         <PlusIcon className="w-4 h-4" />
                                     </Button>
@@ -1174,8 +1216,9 @@ export const EntityList = forwardRef<
                                                     <ListItemWithMenu
                                                         key={`prompt-${index}`}
                                                         name={prompt.name}
+                                                        value={prompt.prompt}
                                                         isSelected={selectedEntity?.type === "prompt" && selectedEntity.name === prompt.name}
-                                                        onClick={() => onSelectPrompt(prompt.name)}
+                                                        onClick={() => handleVariableClick(prompt)}
                                                         selectedRef={selectedEntity?.type === "prompt" && selectedEntity.name === prompt.name ? selectedRef : undefined}
                                                         icon={<ScrollText className="w-4 h-4 text-blue-600/70 dark:text-blue-500/70" />}
                                                         menuContent={
@@ -1188,7 +1231,7 @@ export const EntityList = forwardRef<
                                                 ))}
                                             </div>
                                         ) : (
-                                            <EmptyState entity="prompts" hasFilteredItems={false} />
+                                            <EmptyState entity="variables" hasFilteredItems={false} />
                                         )}
                                     </div>
                                 </div>
@@ -1227,6 +1270,27 @@ export const EntityList = forwardRef<
                 useRagS3Uploads={useRagS3Uploads}
                 useRagScraping={useRagScraping}
             />
+            <AddVariableModal
+                isOpen={showAddVariableModal}
+                onClose={() => {
+                    setShowAddVariableModal(false);
+                    setEditingVariable(null);
+                }}
+                onConfirm={(name, value) => {
+                    if (editingVariable) {
+                        // Update existing variable using modal-specific handler
+                        onUpdatePromptFromModal(editingVariable.name, { name, prompt: value });
+                    } else {
+                        // Add new variable using modal-specific handler
+                        onAddPromptFromModal({ name, prompt: value });
+                    }
+                    setShowAddVariableModal(false);
+                    setEditingVariable(null);
+                }}
+                initialName={editingVariable?.name}
+                initialValue={editingVariable?.value}
+                isEditing={!!editingVariable}
+            />
         </div>
     );
 });
@@ -1922,4 +1986,134 @@ function AgentTypeModal({ isOpen, onClose, onConfirm, onCreatePipeline }: AgentT
             </ModalContent>
         </Modal>
     );
+}
+
+interface AddVariableModalProps {
+    isOpen: boolean;
+    onClose: () => void;
+    onConfirm: (name: string, value: string) => void;
+    initialName?: string;
+    initialValue?: string;
+    isEditing?: boolean;
+}
+
+function AddVariableModal({ isOpen, onClose, onConfirm, initialName, initialValue, isEditing = false }: AddVariableModalProps) {
+    const [name, setName] = useState('');
+    const [value, setValue] = useState('');
+    const [errors, setErrors] = useState<{ name?: string; value?: string }>({});
+
+    // Initialize form with values when modal opens
+    useEffect(() => {
+        if (isOpen) {
+            setName(initialName || '');
+            setValue(initialValue || '');
+            setErrors({});
+        }
+    }, [isOpen, initialName, initialValue]);
+
+    const resetForm = () => {
+        setName('');
+        setValue('');
+        setErrors({});
+    };
+
+    const handleClose = () => {
+        resetForm();
+        onClose();
+    };
+
+    const handleConfirm = () => {
+        const newErrors: { name?: string; value?: string } = {};
+        
+        if (!name.trim()) {
+            newErrors.name = 'Variable name is required';
+        }
+        
+        if (!value.trim()) {
+            newErrors.value = 'Variable value is required';
+        }
+
+        if (Object.keys(newErrors).length > 0) {
+            setErrors(newErrors);
+            return;
+        }
+
+        onConfirm(name.trim(), value.trim());
+        resetForm();
+    };
+
+    return (
+        <Modal isOpen={isOpen} onClose={handleClose} size="md">
+            <ModalContent>
+                <ModalHeader>
+                    <div className="flex items-center gap-2">
+                        <PenLine className="w-5 h-5 text-indigo-600" />
+                        <span>{isEditing ? 'Edit Variable' : 'Add Variable'}</span>
+                    </div>
+                </ModalHeader>
+                <ModalBody className="space-y-4">
+                    <div>
+                        <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                            Variable Name
+                        </label>
+                        <input
+                            type="text"
+                            value={name}
+                            onChange={(e) => {
+                                setName(e.target.value);
+                                if (errors.name) setErrors(prev => ({ ...prev, name: undefined }));
+                            }}
+                            placeholder="Enter variable name (e.g., greeting_message)"
+                            className={clsx(
+                                "w-full px-3 py-2 border rounded-md text-sm",
+                                "focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500",
+                                "dark:bg-gray-800 dark:border-gray-600 dark:text-gray-100",
+                                errors.name ? "border-red-500" : "border-gray-300 dark:border-gray-600"
+                            )}
+                        />
+                        {errors.name && (
+                            <p className="mt-1 text-sm text-red-600 dark:text-red-400">{errors.name}</p>
+                        )}
+                    </div>
+                    <div>
+                        <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                            Variable Value
+                        </label>
+                        <textarea
+                            value={value}
+                            onChange={(e) => {
+                                setValue(e.target.value);
+                                if (errors.value) setErrors(prev => ({ ...prev, value: undefined }));
+                            }}
+                            placeholder="Enter the variable value..."
+                            rows={4}
+                            className={clsx(
+                                "w-full px-3 py-2 border rounded-md text-sm resize-none",
+                                "focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500",
+                                "dark:bg-gray-800 dark:border-gray-600 dark:text-gray-100",
+                                errors.value ? "border-red-500" : "border-gray-300 dark:border-gray-600"
+                            )}
+                        />
+                        {errors.value && (
+                            <p className="mt-1 text-sm text-red-600 dark:text-red-400">{errors.value}</p>
+                        )}
+                    </div>
+                </ModalBody>
+                <ModalFooter>
+                    <Button
+                        variant="secondary"
+                        onClick={handleClose}
+                    >
+                        Cancel
+                    </Button>
+                    <Button
+                        variant="primary"
+                        onClick={handleConfirm}
+                    >
+                        {isEditing ? 'Update Variable' : 'Add Variable'}
+                    </Button>
+                </ModalFooter>
+            </ModalContent>
+        </Modal>
+    );
 } 
\ No newline at end of file
diff --git a/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx b/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx
index 9788e7a4..1e1c6268 100644
--- a/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx
+++ b/apps/rowboat/app/projects/[projectId]/workflow/workflow_editor.tsx
@@ -85,6 +85,9 @@ export type Action = {
 } | {
     type: "add_prompt";
     prompt: Partial<z.infer<typeof WorkflowPrompt>>;
+} | {
+    type: "add_prompt_no_select";
+    prompt: Partial<z.infer<typeof WorkflowPrompt>>;
 } | {
     type: "add_pipeline";
     pipeline: Partial<z.infer<typeof WorkflowPipeline>>;
@@ -143,6 +146,10 @@ export type Action = {
     type: "update_prompt";
     name: string;
     prompt: Partial<z.infer<typeof WorkflowPrompt>>;
+} | {
+    type: "update_prompt_no_select";
+    name: string;
+    prompt: Partial<z.infer<typeof WorkflowPrompt>>;
 } | {
     type: "toggle_agent";
     name: string;
@@ -391,10 +398,10 @@ function reducer(state: State, action: Action): State {
                             if (isLive) {
                                 break;
                             }
-                            let newPromptName = "New prompt";
+                            let newPromptName = "New Variable";
                             if (draft.workflow?.prompts.some((prompt) => prompt.name === newPromptName)) {
-                                newPromptName = `New prompt ${draft.workflow?.prompts.filter((prompt) =>
-                                    prompt.name.startsWith("New prompt")).length + 1}`;
+                                newPromptName = `New Variable ${draft.workflow?.prompts.filter((prompt) =>
+                                    prompt.name.startsWith("New Variable")).length + 1}`;
                             }
                             draft.workflow?.prompts.push({
                                 name: newPromptName,
@@ -410,6 +417,26 @@ function reducer(state: State, action: Action): State {
                             draft.chatKey++;
                             break;
                         }
+                        case "add_prompt_no_select": {
+                            if (isLive) {
+                                break;
+                            }
+                            let newPromptName = "New Variable";
+                            if (draft.workflow?.prompts.some((prompt) => prompt.name === newPromptName)) {
+                                newPromptName = `New Variable ${draft.workflow?.prompts.filter((prompt) =>
+                                    prompt.name.startsWith("New Variable")).length + 1}`;
+                            }
+                            draft.workflow?.prompts.push({
+                                name: newPromptName,
+                                type: "base_prompt",
+                                prompt: "",
+                                ...action.prompt
+                            });
+                            // Don't set selection - this is the key difference
+                            draft.pendingChanges = true;
+                            draft.chatKey++;
+                            break;
+                        }
                         case "add_pipeline": {
                             if (isLive) {
                                 break;
@@ -751,6 +778,47 @@ function reducer(state: State, action: Action): State {
                             draft.pendingChanges = true;
                             draft.chatKey++;
                             break;
+                        case "update_prompt_no_select":
+                            if (isLive) {
+                                break;
+                            }
+
+                            // update prompt data
+                            draft.workflow.prompts = draft.workflow.prompts.map((prompt) =>
+                                prompt.name === action.name ? { ...prompt, ...action.prompt } : prompt
+                            );
+
+                            // if the prompt is renamed
+                            if (action.prompt.name && action.prompt.name !== action.name) {
+                                // update this prompts references in other agents / prompts
+                                draft.workflow.agents = draft.workflow.agents.map(agent => ({
+                                    ...agent,
+                                    instructions: agent.instructions.replace(
+                                        `[@prompt:${action.name}](#mention)`,
+                                        `[@prompt:${action.prompt.name}](#mention)`
+                                    )
+                                }));
+                                draft.workflow.prompts = draft.workflow.prompts.map(prompt => ({
+                                    ...prompt,
+                                    prompt: prompt.prompt.replace(
+                                        `[@prompt:${action.name}](#mention)`,
+                                        `[@prompt:${action.prompt.name}](#mention)`
+                                    )
+                                }));
+
+                                // if this is the selected prompt, update the selection
+                                if (draft.selection?.type === "prompt" && draft.selection.name === action.name) {
+                                    draft.selection = {
+                                        type: "prompt",
+                                        name: action.prompt.name
+                                    };
+                                }
+                            }
+
+                            // Don't set selection - this is the key difference
+                            draft.pendingChanges = true;
+                            draft.chatKey++;
+                            break;
                         case "toggle_agent":
                             if (isLive) {
                                 break;
@@ -1074,6 +1142,15 @@ export function WorkflowEditor({
         dispatch({ type: "update_prompt", name, prompt });
     }
 
+    // Modal-specific handlers that don't auto-select
+    function handleAddPromptFromModal(prompt: Partial<z.infer<typeof WorkflowPrompt>>) {
+        dispatch({ type: "add_prompt_no_select", prompt });
+    }
+
+    function handleUpdatePromptFromModal(name: string, prompt: Partial<z.infer<typeof WorkflowPrompt>>) {
+        dispatch({ type: "update_prompt_no_select", name, prompt });
+    }
+
     function handleDeletePrompt(name: string) {
         if (window.confirm(`Are you sure you want to delete the prompt "${name}"?`)) {
             dispatch({ type: "delete_prompt", name });
@@ -1129,7 +1206,23 @@ export function WorkflowEditor({
     // Remove handleCopyJSON and add handleDownloadJSON
     function handleDownloadJSON() {
         const workflow = state.present.workflow;
-        const json = JSON.stringify(workflow, null, 2);
+        
+        // Create a copy of the workflow and replace variable values with dummy text
+        const workflowCopy = {
+            ...workflow,
+            prompts: workflow.prompts.map(prompt => {
+                // If this is a variable (base_prompt type), replace its value with dummy text
+                if (prompt.type === 'base_prompt') {
+                    return {
+                        ...prompt,
+                        prompt: '<needs to be added>'
+                    };
+                }
+                return prompt;
+            })
+        };
+        
+        const json = JSON.stringify(workflowCopy, null, 2);
         const blob = new Blob([json], { type: 'application/json' });
         const url = window.URL.createObjectURL(blob);
         const a = document.createElement('a');
@@ -1310,6 +1403,9 @@ export function WorkflowEditor({
                                 onAddAgent={handleAddAgent}
                                 onAddTool={handleAddTool}
                                 onAddPrompt={handleAddPrompt}
+                                onUpdatePrompt={handleUpdatePrompt}
+                                onAddPromptFromModal={handleAddPromptFromModal}
+                                onUpdatePromptFromModal={handleUpdatePromptFromModal}
                                 onAddPipeline={handleAddPipeline}
                                 onAddAgentToPipeline={handleAddAgentToPipeline}
                                 onToggleAgent={handleToggleAgent}
diff --git a/apps/rowboat/src/application/lib/agents-runtime/agent_instructions.ts b/apps/rowboat/src/application/lib/agents-runtime/agent_instructions.ts
index fc189822..7fc49443 100644
--- a/apps/rowboat/src/application/lib/agents-runtime/agent_instructions.ts
+++ b/apps/rowboat/src/application/lib/agents-runtime/agent_instructions.ts
@@ -143,4 +143,24 @@ export const PIPELINE_TYPE_INSTRUCTIONS = (): string => `
 - Your response should be self-contained and ready to be consumed by the next pipeline step.
 - Reading the message history will show you the pipeline execution flow up to your step.
 - These are high level instructions only. The user will provide more specific instructions which will be below.
-`;
\ No newline at end of file
+`;
+
+/**
+ * Instructions for providing variable context to agents
+ * Appends variable names and values to agent system prompts
+ */
+export const VARIABLES_CONTEXT_INSTRUCTIONS = (variablesList: Array<{name: string, value: string}>): string => {
+    if (!variablesList || variablesList.length === 0) {
+        return '';
+    }
+
+    const variablesText = variablesList
+        .map(variable => `${variable.name}: ${variable.value}`)
+        .join('\n');
+
+    return `
+# Variables Context
+Here is information that is already provided:
+${variablesText}
+`;
+};
\ No newline at end of file
diff --git a/apps/rowboat/src/application/lib/agents-runtime/agents.ts b/apps/rowboat/src/application/lib/agents-runtime/agents.ts
index 7f6a38c4..0c632c6b 100644
--- a/apps/rowboat/src/application/lib/agents-runtime/agents.ts
+++ b/apps/rowboat/src/application/lib/agents-runtime/agents.ts
@@ -9,7 +9,7 @@ import crypto from "crypto";
 // Internal dependencies
 import { createTools, createRagTool } from "./agent-tools";
 import { ConnectedEntity, sanitizeTextWithMentions, Workflow, WorkflowAgent, WorkflowPipeline, WorkflowPrompt, WorkflowTool } from "@/app/lib/types/workflow_types";
-import { CHILD_TRANSFER_RELATED_INSTRUCTIONS, CONVERSATION_TYPE_INSTRUCTIONS, PIPELINE_TYPE_INSTRUCTIONS, RAG_INSTRUCTIONS, TASK_TYPE_INSTRUCTIONS } from "./agent_instructions";
+import { CHILD_TRANSFER_RELATED_INSTRUCTIONS, CONVERSATION_TYPE_INSTRUCTIONS, PIPELINE_TYPE_INSTRUCTIONS, RAG_INSTRUCTIONS, TASK_TYPE_INSTRUCTIONS, VARIABLES_CONTEXT_INSTRUCTIONS } from "./agent_instructions";
 import { PrefixLogger } from "@/app/lib/utils";
 import { Message, AssistantMessage, AssistantMessageWithToolCalls, ToolMessage } from "@/app/lib/types/types";
 import { UsageTracker } from "@/app/lib/billing";
@@ -99,6 +99,14 @@ function createAgent(
 ): { agent: Agent, entities: z.infer<typeof ConnectedEntity>[] } {
     const agentLogger = logger.child(`createAgent: ${config.name}`);
 
+    // Extract variables from workflow prompts (variables are stored as prompts with type 'base_prompt')
+    const variables = workflow.prompts
+        .filter(prompt => prompt.type === 'base_prompt')
+        .map(prompt => ({
+            name: prompt.name,
+            value: prompt.prompt
+        }));
+
     // Combine instructions and examples
     let instructions = `${RECOMMENDED_PROMPT_PREFIX}
 
@@ -122,6 +130,8 @@ ${config.instructions}
 
 ${config.examples ? ('# Examples\n' + config.examples) : ''}
 
+${VARIABLES_CONTEXT_INSTRUCTIONS(variables)}
+
 ${'-'.repeat(100)}
 
 ${CHILD_TRANSFER_RELATED_INSTRUCTIONS}

From 29a2030abe57ceb20583824db9d794fdd9c0bcf0 Mon Sep 17 00:00:00 2001
From: arkml <arkm85@gmail.com>
Date: Thu, 21 Aug 2025 23:09:45 +0530
Subject: [PATCH 11/15] added new prebuilt agents

---
 apps/rowboat/app/lib/project_templates.ts | 1434 ++++++++++++++++++---
 1 file changed, 1241 insertions(+), 193 deletions(-)

diff --git a/apps/rowboat/app/lib/project_templates.ts b/apps/rowboat/app/lib/project_templates.ts
index 627725da..f76121dd 100644
--- a/apps/rowboat/app/lib/project_templates.ts
+++ b/apps/rowboat/app/lib/project_templates.ts
@@ -29,28 +29,30 @@ export const templates: { [key: string]: z.infer<typeof WorkflowTemplate> } = {
 
     "meeting-prep": {
         "name": "Meeting Prep",
-        "description": "Fetches meetings from your calendar and prepares you for them",
+        "description": "Pipeline that researches meeting attendees and sends the compiled summary to a specified Slack channel",
         "agents": [
             {
-                "name": "Meeting Prep Hub",
-                "type": "conversation",
-                "description": "Hub agent to orchestrate fetching attendee details and preparing a meeting brief.",
-                "instructions": "## 🧑‍💼 Role:\nYou orchestrate the workflow to fetch attendee details for a calendar event and prepare a meeting brief by researching attendees and their companies.\n\n---\n## ⚙️ Steps to Follow:\n1. Greet the user and ask which event they want to prepare for (ask for event title and, if needed, time).\n2. FIRST: Send the event details to [@agent:Attendee Fetch Agent] to get attendee details.\n3. Wait for the complete attendee list from Attendee Fetch Agent.\n4. THEN: Send the attendee list to [@agent:Attendee Research Agent] to research and prepare the meeting brief.\n5. Return the meeting brief to the user.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Orchestrating the workflow for meeting preparation.\n\n❌ Out of Scope:\n- Directly fetching attendee details or researching attendees.\n- Handling unrelated user queries.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Follow the strict sequence: fetch attendees, then research, then respond.\n- Only interact with the user for event details and final meeting brief.\n\n🚫 Don'ts:\n- Do not attempt to fetch or research directly.\n- Do not try to get both steps done simultaneously.\n- Do not reference the individual agents in user-facing messages.\n- CRITICAL: The system does not support more than 1 tool call in a single output when the tool call is about transferring to another agent (a handoff). You must only put out 1 transfer related tool call in one output.",
-                "model": DEFAULT_MODEL,
+                "name": "Research Agent",
+                "type": "pipeline",
+                "description": "Internal agent that researches meeting attendees and returns a compiled summary.",
+                "disabled": false,
+                "instructions": "## Role\nYou are a pipeline agent that researches meeting attendees.\n\n---\n## Task\n1. You will receive attendee details from a previous step.\n2. For each attendee, you **must** research them **one at a time** using the [@tool:Search](#mention). Do NOT research the user `{{Exclude user}}`!\n3. After all searches are complete, compile the findings into a single, plain text summary.\n4. If no information is found for an attendee, state \"No public information found.\" for that person.\n5. Return **only** the final compiled summary.\n\n---\n## Constraint\nDo **NOT** interact with users or send messages. Your only output is the final summary text.",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
                 "toggleAble": true,
                 "ragReturnType": "chunks",
                 "ragK": 3,
-                "controlType": "retain",
-                "outputVisibility": "user_facing",
-                "examples": "- **User** : I want to prepare for my 'Q3 Planning Meeting'.\n - **Agent actions**: Call [@agent:Attendee Fetch Agent](#mention)\n\n- **Agent receives attendee list** :\n - **Agent actions**: Call [@agent:Attendee Research Agent](#mention)\n\n- **Agent receives meeting brief** :\n - **Agent response**: Here is your meeting brief: [summary]\n\n- **User** : I want to prepare for a meeting but don't know the event title.\n - **Agent response**: Please provide the event title (and time, if possible) so I can fetch the attendee details."
+                "controlType": "relinquish_to_parent",
+                "outputVisibility": "internal",
+                "maxCallsPerParentAgent": 3
             },
             {
-                "name": "Attendee Fetch Agent",
-                "type": "conversation",
-                "description": "Fetches attendee details for a specified event from the user's primary calendar.",
+                "name": "Slack Send Agent",
+                "type": "pipeline",
+                "description": "Internal agent that sends the compiled research summary to a channel via Slack direct message and returns confirmation.",
                 "disabled": false,
-                "instructions": "## 🧑‍💼 Role:\nYou fetch attendee details (name, email, company if available) for a specified event from the user's primary calendar by searching through events using the List Events tool.\n\n---\n## ⚙️ Steps to Follow:\n1. Receive the event title (and optionally time) from the parent agent.\n2. Call [@tool:List Events](#mention) with calendarId='primary' and the event title (and optionally time) as search parameters.\n3. Search through the returned events to find the event(s) that best match the provided title (and time, if given).\n4. Extract the attendee details (name, email, company if available) from the matching event.\n5. Return the list of attendees (name, email, company if available) to the parent agent.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Fetching attendee details for a specified event by searching the user's primary calendar.\n\n❌ Out of Scope:\n- Researching attendees or companies.\n- Interacting directly with the user.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Return all available attendee details from the best-matching event.\n- If multiple events match, use the event time (if provided) to disambiguate.\n- If no matching event is found, return an empty list or a clear indication to the parent agent.\n\n🚫 Don'ts:\n- Do not attempt to research or summarize attendee info.\n- Do not interact with the user directly.",
-                "model": DEFAULT_MODEL,
+                "instructions": "## Role\nYou are a pipeline agent that sends a research summary to a Slack channel.\n\n---\n## Task\n1. You will receive a compiled text summary from the previous step.\n2. Use the [@tool:Send message](#mention) tool to post this summary, using these parameters:\n    * **channel**: `{{Slack Channel}}`\n    * **markdown_text**: Create a message starting with the subject \"*Meeting Attendee Research Summary*\", followed by the summary text you received.\n3. Your job is complete after sending the message.\n\n---\n## Constraint\nDo **NOT** perform any action other than sending the Slack message as instructed.",
+                "model": "google/gemini-2.5-flash",
                 "locked": false,
                 "toggleAble": true,
                 "ragReturnType": "chunks",
@@ -58,195 +60,46 @@ export const templates: { [key: string]: z.infer<typeof WorkflowTemplate> } = {
                 "controlType": "relinquish_to_parent",
                 "outputVisibility": "internal",
                 "maxCallsPerParentAgent": 3,
-                "examples": "- **Parent agent** : Fetch attendees for 'Q3 Planning Meeting' at 2024-07-25T10:00:00Z\n - **Agent actions**: Call [@tool:List Events](#mention) with calendarId='primary', q='Q3 Planning Meeting', timeMin/timeMax as needed\n- **Agent receives event list** :\n - **Agent response**: [List of attendees with name, email, company]\n\n- **Parent agent** : Fetch attendees for 'Weekly Sync'\n - **Agent actions**: Call [@tool:List Events](#mention) with calendarId='primary', q='Weekly Sync'\n- **Agent receives event list** :\n - **Agent response**: [List of attendees with name, email, company]"
+                "examples": "- **Parent agent** : <provides attendee research>\n - **Agent actions**: Call [@tool:Send message](#mention)\n - **Agent response**: Message sent to Slack channel.\n"
             },
             {
-                "name": "Attendee Research Agent",
-                "type": "conversation",
-                "description": "Researches each attendee and their company using Google search, then summarizes findings for meeting preparation.",
+                "name": "Attendee Research & Slack Pipeline Step 1",
+                "type": "pipeline",
+                "description": "",
                 "disabled": false,
-                "instructions": "## 🧑‍💼 Role:\nYou research each attendee and their company using Google search, then summarize findings to prepare the user for a meeting.\n\n---\n## ⚙️ Steps to Follow:\n1. Receive a list of attendees (name, email, company if available) from the parent agent.\n2. For each attendee:\n   a. Search for the attendee's name and company using [@tool:Composio Google Search](#mention).\n   b. Summarize key information about the attendee (role, background, recent news, etc.).\n   c. Search for the company (if available) and summarize key facts (industry, size, recent news, etc.).\n3. Compile a concise meeting brief with all findings.\n4. Return the meeting brief to the parent agent.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Researching attendees and their companies.\n- Summarizing findings for meeting prep.\n\n❌ Out of Scope:\n- Fetching attendee details from the calendar.\n- Interacting with the calendar directly.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Be concise and actionable in your summaries.\n- Highlight anything notable or recent.\n\n🚫 Don'ts:\n- Do not fabricate information.\n- Do not include irrelevant details.",
-                "model": DEFAULT_MODEL,
+                "instructions": "",
+                "model": "gpt-4o",
                 "locked": false,
                 "toggleAble": true,
                 "ragReturnType": "chunks",
                 "ragK": 3,
-                "controlType": "retain",
-                "outputVisibility": "user_facing",
-                "maxCallsPerParentAgent": 3,
-                "examples": "- **User** : (N/A, internal agent)\n- **Parent agent** : Research these attendees: [Jane Doe, Acme Corp, jane@acme.com]\n - **Agent actions**: Call [@tool:Composio Google Search](#mention) for 'Jane Doe Acme Corp', then for 'Acme Corp'\n- **Agent receives search results** :\n - **Agent response**: \nMeeting Brief:\n- Jane Doe (Acme Corp): VP of Product. Recent interview in TechCrunch. ...\n- Acme Corp: Leading SaaS provider, 500 employees, raised Series C in 2023."
+                "controlType": "relinquish_to_parent",
+                "outputVisibility": "internal",
+                "maxCallsPerParentAgent": 3
             }
         ],
-        "prompts": [],
-        "tools": [
+        "prompts": [
             {
-                "name": "List Events",
-                "description": "Returns events on the specified calendar.",
-                "parameters": {
-                    "type": "object",
-                    "properties": {
-                        "alwaysIncludeEmail": {
-                            "default": null,
-                            "description": "Deprecated and ignored.",
-                            "nullable": true,
-                            "title": "Always Include Email",
-                            "type": "boolean"
-                        },
-                        "calendarId": {
-                            "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the \"primary\" keyword.",
-                            "examples": [
-                                "primary"
-                            ],
-                            "title": "Calendar Id",
-                            "type": "string"
-                        },
-                        "eventTypes": {
-                            "default": null,
-                            "description": "Event types to return. Optional. This parameter can be repeated multiple times to return events of different types. If unset, returns all event types. Acceptable values are: \"birthday\", \"default\", \"focusTime\", \"fromGmail\", \"outOfOffice\", \"workingLocation\".",
-                            "nullable": true,
-                            "title": "Event Types",
-                            "type": "string"
-                        },
-                        "iCalUID": {
-                            "default": null,
-                            "description": "Specifies an event ID in the iCalendar format to be provided in the response. Optional. Use this if you want to search for an event by its iCalendar ID.",
-                            "nullable": true,
-                            "title": "I Cal Uid",
-                            "type": "string"
-                        },
-                        "maxAttendees": {
-                            "default": null,
-                            "description": "The maximum number of attendees to include in the response. If there are more than the specified number of attendees, only the participant is returned. Optional.",
-                            "nullable": true,
-                            "title": "Max Attendees",
-                            "type": "integer"
-                        },
-                        "maxResults": {
-                            "default": null,
-                            "description": "Maximum number of events returned on one result page. The number of events in the resulting page may be less than this value, or none at all, even if there are more events matching the query. Incomplete pages can be detected by a non-empty nextPageToken field in the response. By default the value is 250 events. The page size can never be larger than 2500 events. Optional.",
-                            "nullable": true,
-                            "title": "Max Results",
-                            "type": "integer"
-                        },
-                        "orderBy": {
-                            "default": null,
-                            "description": "The order of the events returned in the result. Optional. The default is an unspecified, stable order. Acceptable values are: \"startTime\", \"updated\".",
-                            "nullable": true,
-                            "title": "Order By",
-                            "type": "string"
-                        },
-                        "pageToken": {
-                            "default": null,
-                            "description": "Token specifying which result page to return. Optional.",
-                            "nullable": true,
-                            "title": "Page Token",
-                            "type": "string"
-                        },
-                        "privateExtendedProperty": {
-                            "default": null,
-                            "description": "Extended properties constraint specified as propertyName=value. Matches only private properties. This parameter might be repeated multiple times to return events that match all given constraints.",
-                            "nullable": true,
-                            "title": "Private Extended Property",
-                            "type": "string"
-                        },
-                        "q": {
-                            "default": null,
-                            "description": "Free text search terms to find events that match these terms in various fields. Optional.",
-                            "nullable": true,
-                            "title": "Q",
-                            "type": "string"
-                        },
-                        "sharedExtendedProperty": {
-                            "default": null,
-                            "description": "Extended properties constraint specified as propertyName=value. Matches only shared properties. This parameter might be repeated multiple times to return events that match all given constraints.",
-                            "nullable": true,
-                            "title": "Shared Extended Property",
-                            "type": "string"
-                        },
-                        "showDeleted": {
-                            "default": null,
-                            "description": "Whether to include deleted events (with status equals \"cancelled\") in the result. Optional. The default is False.",
-                            "nullable": true,
-                            "title": "Show Deleted",
-                            "type": "boolean"
-                        },
-                        "showHiddenInvitations": {
-                            "default": null,
-                            "description": "Whether to include hidden invitations in the result. Optional. The default is False.",
-                            "nullable": true,
-                            "title": "Show Hidden Invitations",
-                            "type": "boolean"
-                        },
-                        "singleEvents": {
-                            "default": null,
-                            "description": "Whether to expand recurring events into instances and only return single one-off events and instances of recurring events. Optional. The default is False.",
-                            "nullable": true,
-                            "title": "Single Events",
-                            "type": "boolean"
-                        },
-                        "syncToken": {
-                            "default": null,
-                            "description": "Token obtained from the nextSyncToken field returned on the last page of results from the previous list request. Optional. The default is to return all entries.",
-                            "nullable": true,
-                            "title": "Sync Token",
-                            "type": "string"
-                        },
-                        "timeMax": {
-                            "default": null,
-                            "description": "Upper bound (exclusive) for an event's start time to filter by. Optional. The default is not to filter by start time. Must be an RFC3339 timestamp with mandatory time zone offset, for example, 2011-06-03T10:00:00-07:00, 2011-06-03T10:00:00Z. Milliseconds may be provided but are ignored. If timeMin is set, timeMax must be greater than timeMin.",
-                            "nullable": true,
-                            "title": "Time Max",
-                            "type": "string"
-                        },
-                        "timeMin": {
-                            "default": null,
-                            "description": "Lower bound (exclusive) for an event's end time to filter by. Optional. The default is not to filter by end time. Must be an RFC3339 timestamp with mandatory time zone offset, for example, 2011-06-03T10:00:00-07:00, 2011-06-03T10:00:00Z. Milliseconds may be provided but are ignored. If timeMax is set, timeMin must be smaller than timeMax.",
-                            "nullable": true,
-                            "title": "Time Min",
-                            "type": "string"
-                        },
-                        "timeZone": {
-                            "default": null,
-                            "description": "Time zone used in the response. Optional. The default is the user's primary time zone.",
-                            "nullable": true,
-                            "title": "Time Zone",
-                            "type": "string"
-                        },
-                        "updatedMin": {
-                            "default": null,
-                            "description": "Lower bound for an event's last modification time (as a RFC3339 timestamp) to filter by. When specified, entries deleted since this time will always be included regardless of showDeleted. Optional. The default is not to filter by last modification time.",
-                            "nullable": true,
-                            "title": "Updated Min",
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "calendarId"
-                    ]
-                },
-                "mockTool": true,
-                "isComposio": true,
-                "composioData": {
-                    "slug": "GOOGLECALENDAR_EVENTS_LIST",
-                    "noAuth": false,
-                    "toolkitName": "Googlecalendar",
-                    "toolkitSlug": "googlecalendar",
-                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/google-calendar.svg"
-                }
+                "name": "Slack Channel",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
             },
             {
-                "name": "Composio Google Search",
-                "description": "Perform a google search using the composio google search api.",
+                "name": "Exclude user",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            }
+        ],
+        "tools": [
+            {
+                "name": "Search",
+                "description": "Performs a web search and scrapes content from the top results.",
                 "parameters": {
                     "type": "object",
                     "properties": {
                         "query": {
-                            "description": "The search query for the Composio Google Search API.",
-                            "examples": [
-                                "Coffee"
-                            ],
-                            "title": "Query",
-                            "type": "string"
+                            "type": "string",
+                            "description": "The search query."
                         }
                     },
                     "required": [
@@ -256,15 +109,1210 @@ export const templates: { [key: string]: z.infer<typeof WorkflowTemplate> } = {
                 "mockTool": true,
                 "isComposio": true,
                 "composioData": {
-                    "slug": "COMPOSIO_SEARCH_SEARCH",
-                    "noAuth": true,
-                    "toolkitName": "Composio search",
-                    "toolkitSlug": "composio_search",
-                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master//composio-logo.png"
+                    "slug": "FIRECRWAL_SEARCH",
+                    "noAuth": false,
+                    "toolkitName": "firecrawl",
+                    "toolkitSlug": "firecrawl",
+                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/firecrawl.svg"
+                }
+            },
+            {
+                "name": "Send message",
+                "description": "Posts a message to a slack channel, direct message, or private group; requires content via `text`, `blocks`, or `attachments`.",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "as_user": {
+                            "description": "Post as the authenticated user instead of as a bot. Defaults to `false`. If `true`, `username`, `icon_emoji`, and `icon_url` are ignored. If `false`, the message is posted as a bot, allowing appearance customization.",
+                            "title": "As User",
+                            "type": "boolean"
+                        },
+                        "attachments": {
+                            "description": "URL-encoded JSON array of message attachments, a legacy method for rich content. See Slack API documentation for structure.",
+                            "examples": [
+                                "%5B%7B%22fallback%22%3A%20%22Required%20plain-text%20summary%20of%20the%20attachment.%22%2C%20%22color%22%3A%20%22%2336a64f%22%2C%20%22pretext%22%3A%20%22Optional%20text%20that%20appears%20above%20the%20attachment%20block%22%2C%20%22author_name%22%3A%20%22Bobby%20Tables%22%2C%20%22title%22%3A%20%22Slack%20API%20Documentation%22%2C%20%22title_link%22%3A%20%22https%3A%2F%2Fapi.slack.com%2F%22%2C%20%22text%22%3A%20%22Optional%20text%20that%20appears%20within%20the%20attachment%22%7D%5D"
+                            ],
+                            "title": "Attachments",
+                            "type": "string"
+                        },
+                        "blocks": {
+                            "description": "DEPRECATED: Use `markdown_text` field instead. URL-encoded JSON array of layout blocks for rich/interactive messages. See Slack API Block Kit docs for structure.",
+                            "examples": [
+                                "%5B%7B%22type%22%3A%20%22section%22%2C%20%22text%22%3A%20%7B%22type%22%3A%20%22mrkdwn%22%2C%20%22text%22%3A%20%22Hello%2C%20world%21%22%7D%7D%5D"
+                            ],
+                            "title": "Blocks",
+                            "type": "string"
+                        },
+                        "channel": {
+                            "description": "ID or name of the channel, private group, or IM channel to send the message to.",
+                            "examples": [
+                                "C1234567890",
+                                "general"
+                            ],
+                            "title": "Channel",
+                            "type": "string"
+                        },
+                        "icon_emoji": {
+                            "description": "Emoji for bot's icon (e.g., ':robot_face:'). Overrides `icon_url`. Applies if `as_user` is `false`.",
+                            "examples": [
+                                ":tada:",
+                                ":slack:"
+                            ],
+                            "title": "Icon Emoji",
+                            "type": "string"
+                        },
+                        "icon_url": {
+                            "description": "Image URL for bot's icon (must be HTTPS). Applies if `as_user` is `false`.",
+                            "examples": [
+                                "https://slack.com/img/icons/appDir_2019_01/Tonito64.png"
+                            ],
+                            "title": "Icon Url",
+                            "type": "string"
+                        },
+                        "link_names": {
+                            "description": "Automatically hyperlink channel names (e.g., #channel) and usernames (e.g., @user) in message text. Defaults to `false` for bot messages.",
+                            "title": "Link Names",
+                            "type": "boolean"
+                        },
+                        "markdown_text": {
+                            "description": "PREFERRED: Write your message in markdown for nicely formatted display. Supports: headers (# ## ###), bold (**text** or __text__), italic (*text* or _text_), strikethrough (~~text~~), inline code (`code`), code blocks (```), links ([text](url)), block quotes (>), lists (- item, 1. item), dividers (--- or ***), context blocks (:::context with images), and section buttons (:::section-button). IMPORTANT: Use \\n for line breaks (e.g., 'Line 1\\nLine 2'), not actual newlines. USER MENTIONS: To tag users, use their user ID with <@USER_ID> format (e.g., <@U1234567890>), not username. ",
+                            "examples": [
+                                "# Status Update\\n\\nSystem is **running smoothly** with *excellent* performance.\\n\\n```bash\\nkubectl get pods\\n```\\n\\n> All services operational ✅",
+                                "## Daily Report\\n\\n- **Deployments**: 5 successful\\n- *Issues*: 0 critical\\n- ~~Maintenance~~: **Completed**\\n\\n---\\n\\n**Next**: Monitor for 24h"
+                            ],
+                            "title": "Markdown Text",
+                            "type": "string"
+                        },
+                        "mrkdwn": {
+                            "description": "Disable Slack's markdown for `text` field if `false`. Default `true` (allows *bold*, _italic_, etc.).",
+                            "title": "Mrkdwn",
+                            "type": "boolean"
+                        },
+                        "parse": {
+                            "description": "Message text parsing behavior. Default `none` (no special parsing). `full` parses as user-typed (links @mentions, #channels). See Slack API docs for details.",
+                            "examples": [
+                                "none",
+                                "full"
+                            ],
+                            "title": "Parse",
+                            "type": "string"
+                        },
+                        "reply_broadcast": {
+                            "description": "If `true` for a threaded reply, also posts to main channel. Defaults to `false`.",
+                            "title": "Reply Broadcast",
+                            "type": "boolean"
+                        },
+                        "text": {
+                            "description": "DEPRECATED: This sends raw text only, use markdown_text field. Primary textual content. Recommended fallback if using `blocks` or `attachments`. Supports mrkdwn unless `mrkdwn` is `false`.",
+                            "examples": [
+                                "Hello from your friendly bot!",
+                                "Reminder: Team meeting at 3 PM today."
+                            ],
+                            "title": "Text",
+                            "type": "string"
+                        },
+                        "thread_ts": {
+                            "description": "Timestamp (`ts`) of an existing message to make this a threaded reply. Use `ts` of the parent message, not another reply. Example: '1476746824.000004'.",
+                            "examples": [
+                                "1618033790.001500"
+                            ],
+                            "title": "Thread Ts",
+                            "type": "string"
+                        },
+                        "unfurl_links": {
+                            "description": "Enable unfurling of text-based URLs. Defaults `false` for bots, `true` if `as_user` is `true`.",
+                            "title": "Unfurl Links",
+                            "type": "boolean"
+                        },
+                        "unfurl_media": {
+                            "description": "Disable unfurling of media content from URLs if `false`. Defaults to `true`.",
+                            "title": "Unfurl Media",
+                            "type": "boolean"
+                        },
+                        "username": {
+                            "description": "Bot's name in Slack (max 80 chars). Applies if `as_user` is `false`.",
+                            "examples": [
+                                "MyBot",
+                                "AlertBot"
+                            ],
+                            "title": "Username",
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "channel"
+                    ]
+                },
+                "mockTool": true,
+                "isComposio": true,
+                "composioData": {
+                    "slug": "SLACK_SEND_MESSAGE",
+                    "noAuth": false,
+                    "toolkitName": "slack",
+                    "toolkitSlug": "slack",
+                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/slack.svg"
                 }
             }
         ],
-        "startAgent": "Meeting Prep Hub",
+        "pipelines": [
+            {
+                "name": "Attendee Research & Slack Pipeline",
+                "description": "Pipeline that researches meeting attendees and sends the compiled summary to a specified Slack channel.",
+                "agents": [
+                    "Research Agent",
+                    "Slack Send Agent"
+                ]
+            }
+        ],
+        "startAgent": "Attendee Research & Slack Pipeline"
+    },
+
+    "interview-scheduler": {
+        "name": "Interview Scheduler",
+        "description": "Orchestrates interview scheduling with candidates from a Google Sheet and handles calendar RSVPs",
+        "agents": [
+            {
+                "name": "Recruitment HR Bot",
+                "type": "conversation",
+                "description": "Hub agent to orchestrate interview scheduling with candidates from a Google Sheet.",
+                "instructions": "## 🧑‍💼 Role:\nYou are the Recruitment HR Bot, responsible for orchestrating the process of scheduling interviews with candidates from a Google Sheet and updating their status, or handling calendar event RSVPs.\n\n---\n## ⚙️ Steps to Follow:\n1. Greet the user.\n2. **IF** the input is a calendar event RSVP (e.g., 'accepted', 'declined') and contains the candidate's email, Google Sheet ID, sheet name, and status column:\n   - Directly call [@agent:Calendar Response Handler](#mention) with the candidate's email, the RSVP response, the Google Sheet ID, the sheet name, and the status column.\n   - Inform the user that the calendar response has been processed.\n3. **ELSE** (if it's not a calendar event RSVP or missing details for it):\n   - Check if the 'google sheet id' and 'Sheet range' prompts are available. If so, use their values. Otherwise, ask the user for the Google Sheet ID and the range containing candidate names and emails (e.g., 'Sheet1!A2:B').\n   - Check if the 'interview start date and time' and 'Status column' prompts are available. If so, use their values. Otherwise, ask for the desired start date and time for interviews (e.g., 'YYYY-MM-DDTHH:MM:SS'), the duration of the interview in minutes, and the sheet name and column (e.g., 'Sheet1!C') where the interview status should be updated.\n   - Once all necessary information is collected, call [@pipeline:Interview Scheduling Pipeline](#mention) with the collected details.\n   - Inform the user when the interview scheduling process is complete.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Orchestrating the workflow for fetching candidates, scheduling interviews, and updating sheet status.\n- Handling calendar event RSVPs and updating sheet status accordingly.\n\n❌ Out of Scope:\n- Directly fetching candidate data, scheduling interviews, or updating sheet status (handled by pipeline agents).\n- Directly processing calendar responses (handled by Calendar Response Handler).\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Prioritize handling calendar event RSVPs if the necessary information is present.\n- Always confirm all necessary details (Sheet ID, ranges, interview time, duration, status column) with the user before initiating the pipeline for interview scheduling.\n- Ensure all steps are completed in sequence.\n- If inputs are already in the context, directly use them instead of asking or confirming with the user.\n\n🚫 Don'ts:\n- Do not perform data fetching, scheduling, or status updates directly.\n- Do not skip any step in the workflow.\n- Do not mention internal agent names to the user.\n- Do not say 'connecting you to another agent'.\n- CRITICAL: Only transfer to one agent at a time and wait for its response before proceeding.\n\n---\n## 📥 Inputs:\n- **Google Sheet ID**: The unique identifier of the Google Spreadsheet containing candidate data. (e.g., '1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms')\n- **Sheet Range**: The range in A1 notation (e.g., 'Sheet1!A2:B') containing candidate names and emails.\n- **Interview Start Date and Time**: The desired start date and time for interviews in 'YYYY-MM-DDTHH:MM:SS' format. Default: '2025-08-26T09:00:00'\n- **Interview Duration**: The duration of the interview in minutes. Default: 30\n- **Status Column**: The sheet name and column (e.g., 'Sheet1!C') where the interview status should be updated.",
+                "examples": "- **User** : I want to schedule interviews for candidates from a Google Sheet.\n - **Agent response**: Sure! Please provide the desired start date and time for interviews (e.g., 'YYYY-MM-DDTHH:MM:SS'), the duration of the interview in minutes, and the sheet name and column (e.g., 'Sheet1!C') where the interview status should be updated.\n\n- **User** : Start Time: 2024-09-01T10:00:00, Duration: 30, Status Column: Sheet1!C\n - **Agent actions**: Call [@pipeline:Interview Scheduling Pipeline](#mention)\n\n- **Agent receives pipeline completion** :\n - **Agent response**: The interview scheduling process is complete.\n\n- **User** : Candidate [candidate_email] has accepted the interview. Sheet ID: [sheet_id], Sheet Name: [sheet_name], Status Column: [status_column]\n - **Agent actions**: Call [@agent:Calendar Response Handler](#mention)\n\n- **Agent receives Calendar Response Handler completion** :\n - **Agent response**: The calendar response has been processed and the sheet updated.",
+                "model": "google/gemini-2.5-flash",
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "user_facing",
+                "controlType": "retain"
+            },
+            {
+                "name": "Pipeline Step 1 - Fetch Candidates",
+                "type": "pipeline",
+                "description": "Reads candidate names and emails from a specified Google Sheet range.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nFetch candidate names and emails from the provided Google Sheet and ranges.\n\n---\n## ⚙️ Steps to Follow:\n1. Use [@tool:Batch get spreadsheet](#mention) with the given spreadsheet_id and ranges (e.g., 'Sheet1!A2:B').\n2. Return a normalized array of { name, email } objects.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Fetching rows from Google Sheets and returning structured data.\n\n❌ Out of Scope:\n- Scheduling interviews or updating sheet status.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Validate rows and skip empties.\n🚫 Don'ts:\n- Do not schedule interviews or update sheet status.",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "Pipeline Step 2 - Schedule Interview",
+                "type": "pipeline",
+                "description": "Schedules an interview for each candidate using Google Calendar.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nSchedule an interview for each candidate.\n\n---\n## ⚙️ Steps to Follow:\n1. Receive a list of { name, email } objects from the previous step.\n2. For each candidate, use [@tool:Create Event](#mention) to schedule an interview. The event summary should be 'Interview with [Candidate Name]', and the attendee should be the candidate's email. You will need to ask the user for the start_datetime and duration of the interview.\n3. Return a list of { candidate_email, status: 'scheduled' } for each successfully scheduled interview.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Scheduling interviews on Google Calendar.\n\n❌ Out of Scope:\n- Fetching candidate data or updating sheet status.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Ensure all required fields for event creation are provided.\n🚫 Don'ts:\n- Do not fetch candidate data or update sheet status.",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "Pipeline Step 3 - Update Sheet Status",
+                "type": "pipeline",
+                "description": "Updates the status column in the Google Sheet to 'interview scheduled' for each candidate.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nUpdate the status column in the Google Sheet for scheduled interviews.\n\n---\n## ⚙️ Steps to Follow:\n1. Receive a list of { candidate_email, status: 'scheduled' } objects from the previous step.\n2. For each candidate, use [@tool:Batch update spreadsheet](#mention) to update the corresponding row in the Google Sheet. You will need to ask the user for the spreadsheet_id, sheet_name, and the column where the status needs to be updated.\n3. The value to be updated should be 'invite sent'.\n4. Return a confirmation of the updates.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Updating the status column in the Google Sheet.\n\n❌ Out of Scope:\n- Fetching candidate data or scheduling interviews.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Ensure the correct row and column are updated.\n🚫 Don'ts:\n- Do not fetch candidate data or schedule interviews.",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "Interview Scheduling Pipeline Step 1",
+                "type": "pipeline",
+                "description": "",
+                "disabled": false,
+                "instructions": "",
+                "model": "gpt-4o",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "Calendar Response Handler",
+                "type": "conversation",
+                "description": "Handles calendar accept/reject responses and updates the Google Sheet status accordingly.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nProcess calendar responses (accept/reject) and update the Google Sheet with the appropriate interview status.\n\n---\n## ⚙️ Steps to Follow:\n1. Receive the candidate's email, the calendar response (e.g., 'accepted', 'declined'), the Google Sheet ID, the sheet name, and the column where the status needs to be updated.\n2. If the response is 'accepted', set the status to 'interview scheduled'.\n3. If the response is 'declined', set the status to 'declined'.\n4. Use [@tool:Batch update spreadsheet](#mention) to update the corresponding row in the Google Sheet with the determined status.\n5. Return a confirmation of the update.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Interpreting calendar responses and updating the Google Sheet status.\n\n❌ Out of Scope:\n- Scheduling interviews or fetching candidate data.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Accurately map calendar responses to interview statuses.\n- Ensure the correct row and column are updated in the Google Sheet.\n🚫 Don'ts:\n- Do not interact with the user directly.\n- Do not schedule interviews.",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            }
+        ],
+        "prompts": [
+            {
+                "name": "google sheet id",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            },
+            {
+                "name": "Sheet range",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            },
+            {
+                "name": "interview start date and time",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            },
+            {
+                "name": "Status column",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            }
+        ],
+        "tools": [
+            {
+                "name": "Batch get spreadsheet",
+                "description": "Retrieves data from specified cell ranges in a google spreadsheet; ensure the spreadsheet has at least one worksheet and any explicitly referenced sheet names in ranges exist.",
+                "mockTool": false,
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "ranges": {
+                            "description": "A list of cell ranges in A1 notation (e.g., 'Sheet1!A1:B2', 'A1:C5') from which to retrieve data. If this list is omitted or empty, all data from the first sheet of the spreadsheet will be fetched. A range can specify a sheet name (e.g., 'Sheet2!A:A'); if no sheet name is provided in a range string (e.g., 'A1:B2'), it defaults to the first sheet.",
+                            "examples": [
+                                "Sheet1!A1:B2",
+                                "Sheet1!A:A",
+                                "Sheet1!1:2",
+                                "Sheet1!A5:A",
+                                "A1:B2"
+                            ],
+                            "items": {
+                                "type": "string"
+                            },
+                            "title": "Ranges",
+                            "type": "array"
+                        },
+                        "spreadsheet_id": {
+                            "description": "The unique identifier of the Google Spreadsheet from which data will be retrieved.",
+                            "title": "Spreadsheet Id",
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spreadsheet_id"
+                    ]
+                },
+                "isComposio": true,
+                "composioData": {
+                    "slug": "GOOGLESHEETS_BATCH_GET",
+                    "noAuth": false,
+                    "toolkitName": "googlesheets",
+                    "toolkitSlug": "googlesheets",
+                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/google-sheets.svg"
+                }
+            },
+            {
+                "name": "Create Event",
+                "description": "Creates an event on a google calendar, needing rfc3339 utc start/end times (end after start) and write access to the calendar. by default, adds the organizer as an attendee unless exclude organizer is set to true.",
+                "mockTool": false,
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "attendees": {
+                            "default": null,
+                            "description": "List of attendee emails (strings).",
+                            "items": {
+                                "type": "string"
+                            },
+                            "nullable": true,
+                            "title": "Attendees",
+                            "type": "array"
+                        },
+                        "calendar_id": {
+                            "default": "primary",
+                            "description": "Target calendar: 'primary' for the user's main calendar, or the calendar's email address.",
+                            "examples": [
+                                "primary",
+                                "user@example.com",
+                                "abcdefghijklmnopqrstuvwxyz@group.calendar.google.com"
+                            ],
+                            "title": "Calendar Id",
+                            "type": "string"
+                        },
+                        "create_meeting_room": {
+                            "default": null,
+                            "description": "If true, a Google Meet link is created and added to the event. CRITICAL: As of 2024, this REQUIRES a paid Google Workspace account ($13+/month). Personal Gmail accounts will fail with 'Invalid conference type value' error. Solutions: 1) Upgrade to Workspace, 2) Use domain-wide delegation with Workspace user, 3) Use the new Google Meet REST API, or 4) Create events without conferences. See https://github.com/googleapis/google-api-nodejs-client/issues/3234",
+                            "nullable": true,
+                            "title": "Create Meeting Room",
+                            "type": "boolean"
+                        },
+                        "description": {
+                            "default": null,
+                            "description": "Description of the event. Can contain HTML. Optional.",
+                            "nullable": true,
+                            "title": "Description",
+                            "type": "string"
+                        },
+                        "eventType": {
+                            "default": "default",
+                            "description": "Type of the event, immutable post-creation. Currently, only 'default' and 'workingLocation' can be created.",
+                            "enum": [
+                                "default",
+                                "outOfOffice",
+                                "focusTime",
+                                "workingLocation"
+                            ],
+                            "title": "Event Type",
+                            "type": "string"
+                        },
+                        "event_duration_hour": {
+                            "default": 0,
+                            "description": "Number of hours (0-24). Increase by 1 here rather than passing 60 in `event_duration_minutes`",
+                            "maximum": 24,
+                            "minimum": 0,
+                            "title": "Event Duration Hour",
+                            "type": "integer"
+                        },
+                        "event_duration_minutes": {
+                            "default": 30,
+                            "description": "Duration in minutes (0-59 ONLY). NEVER use 60+ minutes - use event_duration_hour=1 instead. Maximum value is 59.",
+                            "maximum": 59,
+                            "minimum": 0,
+                            "title": "Event Duration Minutes",
+                            "type": "integer"
+                        },
+                        "exclude_organizer": {
+                            "default": false,
+                            "description": "If True, the organizer will NOT be added as an attendee. Default is False (organizer is included).",
+                            "title": "Exclude Organizer",
+                            "type": "boolean"
+                        },
+                        "guestsCanInviteOthers": {
+                            "default": null,
+                            "description": "Whether attendees other than the organizer can invite others to the event.",
+                            "nullable": true,
+                            "title": "Guests Can Invite Others",
+                            "type": "boolean"
+                        },
+                        "guestsCanSeeOtherGuests": {
+                            "default": null,
+                            "description": "Whether attendees other than the organizer can see who the event's attendees are.",
+                            "nullable": true,
+                            "title": "Guests Can See Other Guests",
+                            "type": "boolean"
+                        },
+                        "guests_can_modify": {
+                            "default": false,
+                            "description": "If True, guests can modify the event.",
+                            "title": "Guests Can Modify",
+                            "type": "boolean"
+                        },
+                        "location": {
+                            "default": null,
+                            "description": "Geographic location of the event as free-form text.",
+                            "nullable": true,
+                            "title": "Location",
+                            "type": "string"
+                        },
+                        "recurrence": {
+                            "default": null,
+                            "description": "List of RRULE, EXRULE, RDATE, EXDATE lines for recurring events. Supported frequencies are DAILY, WEEKLY, MONTHLY, YEARLY.",
+                            "items": {
+                                "type": "string"
+                            },
+                            "nullable": true,
+                            "title": "Recurrence",
+                            "type": "array"
+                        },
+                        "send_updates": {
+                            "default": null,
+                            "description": "Defaults to True. Whether to send updates to the attendees.",
+                            "nullable": true,
+                            "title": "Send Updates",
+                            "type": "boolean"
+                        },
+                        "start_datetime": {
+                            "description": "Naive date/time (YYYY-MM-DDTHH:MM:SS) with NO offsets or Z. e.g. '2025-01-16T13:00:00'",
+                            "title": "Start Datetime",
+                            "type": "string"
+                        },
+                        "summary": {
+                            "default": null,
+                            "description": "Summary (title) of the event.",
+                            "nullable": true,
+                            "title": "Summary",
+                            "type": "string"
+                        },
+                        "timezone": {
+                            "default": null,
+                            "description": "IANA timezone name (e.g., 'America/New_York'). Required if datetime is naive. If datetime includes timezone info (Z or offset), this field is optional and defaults to UTC.",
+                            "nullable": true,
+                            "title": "Timezone",
+                            "type": "string"
+                        },
+                        "transparency": {
+                            "default": "opaque",
+                            "description": "'opaque' (busy) or 'transparent' (available).",
+                            "enum": [
+                                "opaque",
+                                "transparent"
+                            ],
+                            "title": "Transparency",
+                            "type": "string"
+                        },
+                        "visibility": {
+                            "default": "default",
+                            "description": "Event visibility: 'default', 'public', 'private', or 'confidential'.",
+                            "enum": [
+                                "default",
+                                "public",
+                                "private",
+                                "confidential"
+                            ],
+                            "title": "Visibility",
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "start_datetime"
+                    ]
+                },
+                "isComposio": true,
+                "composioData": {
+                    "slug": "GOOGLECALENDAR_CREATE_EVENT",
+                    "noAuth": false,
+                    "toolkitName": "googlecalendar",
+                    "toolkitSlug": "googlecalendar",
+                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/google-calendar.svg"
+                }
+            },
+            {
+                "name": "Batch update spreadsheet",
+                "description": "Updates a specified range in a google sheet with given values, or appends them as new rows if `first cell location` is omitted; ensure the target sheet exists and the spreadsheet contains at least one worksheet.",
+                "mockTool": false,
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "first_cell_location": {
+                            "description": "The starting cell for the update range, specified in A1 notation (e.g., 'A1', 'B2'). The update will extend from this cell to the right and down, based on the provided values. If omitted, values are appended to the sheet.",
+                            "examples": [
+                                "A1",
+                                "D3"
+                            ],
+                            "title": "First Cell Location",
+                            "type": "string"
+                        },
+                        "includeValuesInResponse": {
+                            "default": false,
+                            "description": "If set to True, the response will include the updated values from the spreadsheet.",
+                            "examples": [
+                                true,
+                                false
+                            ],
+                            "title": "Include Values In Response",
+                            "type": "boolean"
+                        },
+                        "sheet_name": {
+                            "description": "The name of the specific sheet within the spreadsheet to update.",
+                            "examples": [
+                                "Sheet1"
+                            ],
+                            "title": "Sheet Name",
+                            "type": "string"
+                        },
+                        "spreadsheet_id": {
+                            "description": "The unique identifier of the Google Sheets spreadsheet to be updated.",
+                            "examples": [
+                                "1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms"
+                            ],
+                            "title": "Spreadsheet Id",
+                            "type": "string"
+                        },
+                        "valueInputOption": {
+                            "default": "USER_ENTERED",
+                            "description": "How input data is interpreted. 'USER_ENTERED': Values parsed as if typed by a user (e.g., strings may become numbers/dates, formulas are calculated); recommended for formulas. 'RAW': Values stored as-is without parsing (e.g., '123' stays string, '=SUM(A1:B1)' stays string).",
+                            "enum": [
+                                "RAW",
+                                "USER_ENTERED"
+                            ],
+                            "examples": [
+                                "USER_ENTERED",
+                                "RAW"
+                            ],
+                            "title": "Value Input Option",
+                            "type": "string"
+                        },
+                        "values": {
+                            "description": "A 2D list of cell values. Each inner list represents a row. Values can be strings, numbers, or booleans. Ensure columns are properly aligned across rows.",
+                            "examples": [
+                                [
+                                    "Item",
+                                    "Cost",
+                                    "Stocked",
+                                    "Ship Date"
+                                ],
+                                [
+                                    "Wheel",
+                                    20.5,
+                                    true,
+                                    "2020-06-01"
+                                ],
+                                [
+                                    "Screw",
+                                    0.5,
+                                    true,
+                                    "2020-06-03"
+                                ],
+                                [
+                                    "Nut",
+                                    0.25,
+                                    false,
+                                    "2020-06-02"
+                                ]
+                            ],
+                            "items": {
+                                "items": {
+                                    "anyOf": [
+                                        {
+                                            "type": "string"
+                                        },
+                                        {
+                                            "type": "integer"
+                                        },
+                                        {
+                                            "type": "number"
+                                        },
+                                        {
+                                            "type": "boolean"
+                                        }
+                                    ]
+                                },
+                                "type": "array"
+                            },
+                            "title": "Values",
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "spreadsheet_id",
+                        "sheet_name",
+                        "values"
+                    ]
+                },
+                "isComposio": true,
+                "composioData": {
+                    "slug": "GOOGLESHEETS_BATCH_UPDATE",
+                    "noAuth": false,
+                    "toolkitName": "googlesheets",
+                    "toolkitSlug": "googlesheets",
+                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/google-sheets.svg"
+                }
+            }
+        ],
+        "pipelines": [
+            {
+                "name": "Interview Scheduling Pipeline",
+                "description": "Automates interview scheduling: fetches candidates from Google Sheet, schedules interviews, and updates sheet status.",
+                "agents": [
+                    "Pipeline Step 1 - Fetch Candidates",
+                    "Pipeline Step 2 - Schedule Interview",
+                    "Pipeline Step 3 - Update Sheet Status"
+                ]
+            }
+        ],
+        "startAgent": "Recruitment HR Bot"
+    },
+
+    "github-data-to-spreadsheet": {
+        "name": "Add GitHub Stats to Google Sheets",
+        "description": "Fetches GitHub repository stats and logs them to a Google Sheet with Slack notifications",
+        "agents": [
+            {
+                "name": "GitHub Stats Hub",
+                "type": "conversation",
+                "description": "Hub agent that orchestrates fetching GitHub stats for rowboatlabs/rowboat and logging them to a Google Sheet.",
+                "instructions": "## 🧑‍💼 Role:\nYou are the hub agent responsible for orchestrating the process of fetching GitHub repository stats for 'rowboatlabs/rowboat' and logging them to a Google Sheet.\n\n---\n## ⚙️ Steps to Follow:\n1. Receive a user request to log GitHub stats.\n2. FIRST: Call [@agent:GitHub Stats Agent](#mention) and always provide repository owner: 'rowboatlabs' and repo: 'rowboat' as input (do not prompt the user for these values).\n3. Wait for the stats to be returned.\n4. THEN: Call [@agent:GitHub Stats to Sheet Agent](#mention) to append the stats to the Google Sheet.\n5. Wait for confirmation from the Sheets agent.\n6. Inform the user that the data has been logged, or report any error if one occurred.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Orchestrating the sequential workflow: fetch stats for rowboatlabs/rowboat, then log to sheet, then inform the user.\n\n❌ Out of Scope:\n- Fetching stats or logging to the sheet directly (handled by sub-agents).\n- Handling requests unrelated to GitHub stats logging.\n- Accepting or prompting for other repositories.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Always use 'rowboatlabs' as owner and 'rowboat' as repo when calling the GitHub Stats Agent.\n- Always follow the sequence: GitHub Stats Agent first, then GitHub Stats to Sheet Agent.\n- Wait for each agent's complete response before proceeding.\n- Only interact with the user for the initial request and final confirmation.\n\n🚫 Don'ts:\n- Do not perform stats fetching or sheet logging yourself.\n- Do not try to call both agents at once.\n- Do not reference internal agent names to the user.\n- Do not prompt the user for a repository or accept any other repository.\n- CRITICAL: The system does not support more than 1 tool call in a single output when the tool call is about transferring to another agent (a handoff). You must only put out 1 transfer related tool call in one output.\n\n# Examples\n- **User** : Fetch and store stats\n - **Agent actions**: Call [@agent:GitHub Stats Agent](#mention) with owner: 'rowboatlabs', repo: 'rowboat'\n\n- **Agent receives stats** :\n - **Agent actions**: Call [@agent:GitHub Stats to Sheet Agent](#mention)\n\n- **Agent receives sheet confirmation** :\n - **Agent response**: GitHub stats have been logged to the sheet successfully.\n\n- **Agent receives error from sheet agent** :\n - **Agent response**: There was an error logging the stats to the sheet: [error details]\n\n- **User** : Add a dummy row\n - **Agent response**: Sorry, I can only log actual GitHub stats. Please use the workflow to log real data.",
+                "model": "google/gemini-2.5-flash",
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "user_facing",
+                "controlType": "retain"
+            },
+            {
+                "name": "GitHub Stats Agent",
+                "type": "conversation",
+                "description": "Fetches GitHub page view and clone statistics for rowboatlabs/rowboat for the previous day.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nYou are an internal agent that fetches GitHub page view and clone statistics for the repository for the previous day.\n\n---\n## ⚙️ Steps to Follow:\n1. Always use owner: <take from context> and repo: <take from context> (do not expect or prompt for these values from the parent agent).\n2. Use [@tool:Get page views](#mention) with per: 'day' to fetch daily page view stats. You must actually call this tool.\n3. Use [@tool:Get repository clones](#mention) with per: 'day' to fetch daily clone stats. You must actually call this tool.\n4. Filter both results to only include data for the previous day (relative to today, in UTC).\n5. Return both sets of stats (page views and clones for the previous day) to the parent agent.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Fetching and returning GitHub page view and clone stats for 'rowboatlabs/rowboat' for the previous day.\n\n❌ Out of Scope:\n- Answering user questions directly.\n- Modifying repository data.\n- Accepting or prompting for any other repository.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Return only the stats for the previous day.\n- Return both page views and clone stats in a clear, structured format.\n- **Do not simulate or describe tool calls—always actually call the tools.**\n\n🚫 Don'ts:\n- Do not interact with the user directly.\n- Do not perform any actions other than fetching and returning stats.\n- Do not prompt for or accept any repository input.\n\n# Examples\n- **Parent agent** : Fetch and store stats\n - **Agent actions**: Call [@tool:Get page views](#mention) with owner, repo, per: 'day'. Then call [@tool:Get repository clones](#mention) with owner, repo: 'rowboat', per: 'day'.\n - **Agent response**: [Page views and clone stats for owner/repo for the previous day]\n\n\n\n",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "GitHub Stats to Sheet Agent",
+                "type": "conversation",
+                "description": "Appends the latest GitHub clone and view stats as a new row to a specified Google Sheet.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nYou are an internal agent that receives GitHub stats (clones and views), extracts the most recent date for each, and appends a row to a Google Sheet with the specified columns.\n\n---\n## ⚙️ Steps to Follow:\n1. Receive GitHub stats data (including arrays of daily clone and view stats, each with date, count, and uniques).\n2. Identify the most recent (latest) date in the clones array and extract its count and uniques.\n3. Identify the most recent (latest) date in the views array and extract its count and uniques.\n4. Use the current UTC date (YYYY-MM-DD) as the run date.\n5. Prepare a row with the following columns (in order):\n   - run date (current UTC date, YYYY-MM-DD)\n   - latest clones stats date (YYYY-MM-DD)\n   - clones (count)\n   - unique clones\n   - latest view stats date (YYYY-MM-DD)\n   - views (count)\n   - unique views\n6. Use [@tool:Append Values to Spreadsheet](#mention) to append this row to the end of the sheet (no headers).\n   - spreadsheetId: <take from context>\n   - range: <take from context> (or the correct sheet name if specified)\n   - valueInputOption: USER_ENTERED\n   - values: [[run date, latest clones stats date, clones, unique clones, latest view stats date, views, unique views]]\n7. Return a confirmation or error message to the parent agent.\n\n---\n## 🎯 Scope:\n✅ In Scope:\n- Appending a single row of stats to the specified Google Sheet.\n\n❌ Out of Scope:\n- Adding headers or modifying existing data.\n- Interacting with the user directly.\n\n---\n## 📋 Guidelines:\n✔️ Dos:\n- Only use the most recent date for each stat type.\n- Ensure the row is appended at the end (no headers).\n- Use the correct spreadsheetId and valueInputOption.\n\n🚫 Don'ts:\n- Do not add column headers.\n- Do not overwrite existing data.\n- Do not interact with the user directly.\n\n# Examples\n- **Parent agent** : Insert latest GitHub stats into sheet\n - **Agent actions**: Call [@tool:Append Values to Spreadsheet](#mention) with the latest stats and current date\n - **Agent response**: Row appended confirmation or error message\n\n- **Parent agent** : Insert stats with missing data\n - **Agent actions**: If either clones or views data is missing, append available data and leave missing fields blank\n - **Agent response**: Row appended confirmation or error message\n\n- **Parent agent** : Insert stats for a different repo\n - **Agent actions**: Same as above, using provided stats\n - **Agent response**: Row appended confirmation or error message\n\n- **Parent agent** : Insert stats with only views data\n - **Agent actions**: Append row with views data, leave clone fields blank\n - **Agent response**: Row appended confirmation or error message\n\n- **Parent agent** : Insert stats with only clones data\n - **Agent actions**: Append row with clone data, leave view fields blank\n - **Agent response**: Row appended confirmation or error message\n",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "Pipeline Step 1 - Fetch Views Data",
+                "type": "pipeline",
+                "description": "Fetches daily page view stats for rowboatlabs/rowboat using the Get page views tool.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nFetch daily page view stats for the repository 'rowboatlabs/rowboat'.\n\n---\n## ⚙️ Steps to Follow:\n1. Use [@tool:Get page views](#mention) with owner: 'rowboatlabs', repo: 'rowboat', per: 'day'.\n2. Return the full result to the next pipeline step.\n\n---\n## 📋 Guidelines:\n- Do not prompt for repository details; always use the specified owner and repo.\n- Do not interact with the user or other agents.",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "Pipeline Step 2 - Fetch Clones Data",
+                "type": "pipeline",
+                "description": "Fetches daily clone stats for rowboatlabs/rowboat using the Get repository clones tool.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nFetch daily clone stats for the repository 'rowboatlabs/rowboat'.\n\n---\n## ⚙️ Steps to Follow:\n1. Use [@tool:Get repository clones](#mention) with owner: 'rowboatlabs', repo: 'rowboat', per: 'day'.\n2. Return the full result to the next pipeline step, along with the previous step's page views data.\n\n---\n## 📋 Guidelines:\n- Do not prompt for repository details; always use the specified owner and repo.\n- Do not interact with the user or other agents.",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "Pipeline Step 3 - Add Data to Sheet",
+                "type": "pipeline",
+                "description": "Appends the latest GitHub clone and view stats as a new row to the specified Google Sheet.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nAppend the latest GitHub stats (clones and views) as a new row to the Google Sheet.\n\n---\n## ⚙️ Steps to Follow:\n1. Receive both page views and clone stats (arrays of daily stats, each with date, count, uniques).\n2. Identify the most recent (latest) date in the clones array and extract its count and uniques.\n3. Identify the most recent (latest) date in the views array and extract its count and uniques.\n4. Use the current UTC date (YYYY-MM-DD) as the run date.\n5. Prepare a row with the following columns (in order):\n   - run date (current UTC date, YYYY-MM-DD)\n   - latest clones stats date (YYYY-MM-DD)\n   - clones (count)\n   - unique clones\n   - latest view stats date (YYYY-MM-DD)\n   - views (count)\n   - unique views\n6. Use [@tool:Append Values to Spreadsheet](#mention) to append this row to the end of the sheet (no headers).\n   - spreadsheetId: <take from context>\n   - range: <take from context>\n   - valueInputOption: USER_ENTERED\n   - values: [[run date, latest clones stats date, clones, unique clones, latest view stats date, views, unique views]]\n7. Return the appended row and all relevant stats to the next pipeline step.\n\n---\n## 📋 Guidelines:\n- Only use the most recent date for each stat type.\n- Ensure the row is appended at the end (no headers).\n- Use the correct spreadsheetId and valueInputOption.\n- Do not interact with the user or other agents.\n\n",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "Pipeline Step 4 - Send Slack Summary",
+                "type": "pipeline",
+                "description": "Sends a summary message to the #stats Slack channel, including a link to the updated sheet.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nSend a summary message to the #stats Slack channel after stats are logged to the sheet.\n\n---\n## ⚙️ Steps to Follow:\n1. Receive the appended row and all relevant stats from the previous step.\n2. Compose a message summarizing the latest GitHub stats update, including:\n   - The run date\n   - The latest clones and views stats (date, count, uniques)\n   - A statement that the data has been updated in the sheet\n   - A link to the sheet: <take from context>\n3. Use [@tool:Send a message to a Slack channel](#mention) to post the message to channel: stats\n4. Return a confirmation or error message.\n\n---\n## 📋 Guidelines:\n- The message should be clear, concise, and include the sheet link.\n- Do not interact with the user or other agents.\n",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "GitHub Stats Logging Pipeline Step 1",
+                "type": "pipeline",
+                "description": "",
+                "disabled": false,
+                "instructions": "",
+                "model": "gpt-4o",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "internal",
+                "controlType": "relinquish_to_parent",
+                "maxCallsPerParentAgent": 3
+            },
+            {
+                "name": "GitHub Stats Pipeline Hub",
+                "type": "conversation",
+                "description": "User-facing hub that triggers the GitHub Stats Logging Pipeline and reports when complete.",
+                "disabled": false,
+                "instructions": "## 🧑‍💼 Role:\nYou are the hub agent responsible for triggering the GitHub Stats Logging Pipeline.\n\n---\n## ⚙️ Steps to Follow:\n1. When the user requests a stats update, call [@pipeline:GitHub Stats Logging Pipeline](#mention).\n2. Wait for the pipeline to complete.\n3. Inform the user that the stats have been logged, the sheet updated, and the Slack channel notified.\n\n---\n## 📋 Guidelines:\n- Do not perform any stats fetching, sheet logging, or Slack messaging yourself.\n- Do not reference internal agent or pipeline names to the user.\n- Only interact with the user for the initial request and final confirmation.",
+                "model": "google/gemini-2.5-flash",
+                "locked": false,
+                "toggleAble": true,
+                "ragReturnType": "chunks",
+                "ragK": 3,
+                "outputVisibility": "user_facing",
+                "controlType": "retain",
+                "maxCallsPerParentAgent": 3
+            }
+        ],
+        "prompts": [
+            {
+                "name": "spreadsheetId",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            },
+            {
+                "name": "range",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            },
+            {
+                "name": "sheet_link",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            },
+            {
+                "name": "Owner",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            },
+            {
+                "name": "repo",
+                "type": "base_prompt",
+                "prompt": "<needs to be added>"
+            }
+        ],
+        "tools": [
+            {
+                "name": "Get page views",
+                "description": "Retrieves page view statistics for a repository over the last 14 days, including total views, unique visitors, and a daily or weekly breakdown.",
+                "mockTool": false,
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "owner": {
+                            "description": "The username of the account that owns the repository. This field is case-insensitive.",
+                            "examples": [
+                                "octocat"
+                            ],
+                            "title": "Owner",
+                            "type": "string"
+                        },
+                        "per": {
+                            "default": "day",
+                            "description": "The time unit for which to aggregate page views.",
+                            "enum": [
+                                "day",
+                                "week"
+                            ],
+                            "examples": [
+                                "day",
+                                "week"
+                            ],
+                            "title": "Per",
+                            "type": "string"
+                        },
+                        "repo": {
+                            "description": "The name of the repository, without the `.git` extension. This field is case-insensitive.",
+                            "examples": [
+                                "Spoon-Knife"
+                            ],
+                            "title": "Repo",
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "owner",
+                        "repo"
+                    ]
+                },
+                "isComposio": true,
+                "composioData": {
+                    "slug": "GITHUB_GET_PAGE_VIEWS",
+                    "noAuth": false,
+                    "toolkitName": "GitHub",
+                    "toolkitSlug": "github",
+                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/github.png"
+                }
+            },
+            {
+                "name": "Append Values to Spreadsheet",
+                "description": "Tool to append values to a spreadsheet. use when you need to add new data to the end of an existing table in a google sheet.",
+                "mockTool": false,
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "includeValuesInResponse": {
+                            "default": null,
+                            "description": "Determines if the update response should include the values of the cells that were appended. By default, responses do not include the updated values.",
+                            "examples": [
+                                true
+                            ],
+                            "nullable": true,
+                            "title": "Include Values In Response",
+                            "type": "boolean"
+                        },
+                        "insertDataOption": {
+                            "default": null,
+                            "description": "How the input data should be inserted.",
+                            "enum": [
+                                "OVERWRITE",
+                                "INSERT_ROWS"
+                            ],
+                            "examples": [
+                                "INSERT_ROWS"
+                            ],
+                            "nullable": true,
+                            "title": "Insert Data Option",
+                            "type": "string"
+                        },
+                        "majorDimension": {
+                            "default": null,
+                            "description": "The major dimension of the values. For output, if the spreadsheet data is: A1=1,B1=2,A2=3,B2=4, then requesting range=A1:B2,majorDimension=ROWS will return [[1,2],[3,4]], whereas requesting range=A1:B2,majorDimension=COLUMNS will return [[1,3],[2,4]].",
+                            "enum": [
+                                "ROWS",
+                                "COLUMNS"
+                            ],
+                            "examples": [
+                                "ROWS"
+                            ],
+                            "nullable": true,
+                            "title": "Major Dimension",
+                            "type": "string"
+                        },
+                        "range": {
+                            "description": "The A1 notation of a range to search for a logical table of data. Values are appended after the last row of the table.",
+                            "examples": [
+                                "Sheet1!A1:B2"
+                            ],
+                            "title": "Range",
+                            "type": "string"
+                        },
+                        "responseDateTimeRenderOption": {
+                            "default": null,
+                            "description": "Determines how dates, times, and durations in the response should be rendered. This is ignored if responseValueRenderOption is FORMATTED_VALUE. The default dateTime render option is SERIAL_NUMBER.",
+                            "enum": [
+                                "SERIAL_NUMBER",
+                                "FORMATTED_STRING"
+                            ],
+                            "examples": [
+                                "SERIAL_NUMBER"
+                            ],
+                            "nullable": true,
+                            "title": "Response Date Time Render Option",
+                            "type": "string"
+                        },
+                        "responseValueRenderOption": {
+                            "default": null,
+                            "description": "Determines how values in the response should be rendered. The default render option is FORMATTED_VALUE.",
+                            "enum": [
+                                "FORMATTED_VALUE",
+                                "UNFORMATTED_VALUE",
+                                "FORMULA"
+                            ],
+                            "examples": [
+                                "FORMATTED_VALUE"
+                            ],
+                            "nullable": true,
+                            "title": "Response Value Render Option",
+                            "type": "string"
+                        },
+                        "spreadsheetId": {
+                            "description": "The ID of the spreadsheet to update.",
+                            "examples": [
+                                "1q0gLhLdGXYZblahblahblah"
+                            ],
+                            "title": "Spreadsheet Id",
+                            "type": "string"
+                        },
+                        "valueInputOption": {
+                            "description": "How the input data should be interpreted.",
+                            "enum": [
+                                "RAW",
+                                "USER_ENTERED"
+                            ],
+                            "examples": [
+                                "USER_ENTERED"
+                            ],
+                            "title": "Value Input Option",
+                            "type": "string"
+                        },
+                        "values": {
+                            "description": "The data to be written. This is an array of arrays, the outer array representing all the data and each inner array representing a major dimension. Each item in the inner array corresponds with one cell.",
+                            "examples": [
+                                [
+                                    [
+                                        "A1_val1",
+                                        "A1_val2"
+                                    ],
+                                    [
+                                        "A2_val1",
+                                        "A2_val2"
+                                    ]
+                                ]
+                            ],
+                            "items": {
+                                "items": {
+                                    "anyOf": [
+                                        {
+                                            "type": "string"
+                                        },
+                                        {
+                                            "type": "integer"
+                                        },
+                                        {
+                                            "type": "number"
+                                        },
+                                        {
+                                            "type": "boolean"
+                                        }
+                                    ]
+                                },
+                                "type": "array"
+                            },
+                            "title": "Values",
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "spreadsheetId",
+                        "range",
+                        "valueInputOption",
+                        "values"
+                    ]
+                },
+                "isComposio": true,
+                "composioData": {
+                    "slug": "GOOGLESHEETS_SPREADSHEETS_VALUES_APPEND",
+                    "noAuth": false,
+                    "toolkitName": "Googlesheets",
+                    "toolkitSlug": "googlesheets",
+                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/google-sheets.svg"
+                }
+            },
+            {
+                "name": "Get repository clones",
+                "description": "Retrieves the total number of clones and a breakdown of clone activity (daily or weekly) for a specified repository over the preceding 14 days.",
+                "mockTool": false,
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "owner": {
+                            "description": "The username of the account that owns the repository. This field is not case-sensitive.",
+                            "examples": [
+                                "octocat",
+                                "github"
+                            ],
+                            "title": "Owner",
+                            "type": "string"
+                        },
+                        "per": {
+                            "default": "day",
+                            "description": "Specifies the time frame for aggregating clone data: `day` for daily clone counts, or `week` for weekly clone counts (a week starts on Monday).",
+                            "enum": [
+                                "day",
+                                "week"
+                            ],
+                            "examples": [
+                                "day",
+                                "week"
+                            ],
+                            "title": "Per",
+                            "type": "string"
+                        },
+                        "repo": {
+                            "description": "The name of the repository, without the '.git' extension. This field is not case-sensitive.",
+                            "examples": [
+                                "Hello-World",
+                                "mercury"
+                            ],
+                            "title": "Repo",
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "owner",
+                        "repo"
+                    ]
+                },
+                "isComposio": true,
+                "composioData": {
+                    "slug": "GITHUB_GET_REPOSITORY_CLONES",
+                    "noAuth": false,
+                    "toolkitName": "GitHub",
+                    "toolkitSlug": "github",
+                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/github.png"
+                }
+            },
+            {
+                "name": "Send a message to a Slack channel",
+                "description": "Deprecated: posts a message to a slack channel, direct message, or private group. use `send message` instead.",
+                "mockTool": false,
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "as_user": {
+                            "description": "Post as the authenticated user instead of as a bot. Defaults to `false`. If `true`, `username`, `icon_emoji`, and `icon_url` are ignored. If `false`, the message is posted as a bot, allowing appearance customization.",
+                            "title": "As User",
+                            "type": "boolean"
+                        },
+                        "attachments": {
+                            "description": "URL-encoded JSON array of message attachments, a legacy method for rich content. See Slack API documentation for structure.",
+                            "examples": [
+                                "%5B%7B%22fallback%22%3A%20%22Required%20plain-text%20summary%20of%20the%20attachment.%22%2C%20%22color%22%3A%20%22%2336a64f%22%2C%20%22pretext%22%3A%20%22Optional%20text%20that%20appears%20above%20the%20attachment%20block%22%2C%20%22author_name%22%3A%20%22Bobby%20Tables%22%2C%20%22title%22%3A%20%22Slack%20API%20Documentation%22%2C%20%22title_link%22%3A%20%22https%3A%2F%2Fapi.slack.com%2F%22%2C%20%22text%22%3A%20%22Optional%20text%20that%20appears%20within%20the%20attachment%22%7D%5D"
+                            ],
+                            "title": "Attachments",
+                            "type": "string"
+                        },
+                        "blocks": {
+                            "description": "DEPRECATED: Use `markdown_text` field instead. URL-encoded JSON array of layout blocks for rich/interactive messages. See Slack API Block Kit docs for structure.",
+                            "examples": [
+                                "%5B%7B%22type%22%3A%20%22section%22%2C%20%22text%22%3A%20%7B%22type%22%3A%20%22mrkdwn%22%2C%20%22text%22%3A%20%22Hello%2C%20world%21%22%7D%7D%5D"
+                            ],
+                            "title": "Blocks",
+                            "type": "string"
+                        },
+                        "channel": {
+                            "description": "ID or name of the channel, private group, or IM channel to send the message to.",
+                            "examples": [
+                                "C1234567890",
+                                "general"
+                            ],
+                            "title": "Channel",
+                            "type": "string"
+                        },
+                        "icon_emoji": {
+                            "description": "Emoji for bot's icon (e.g., ':robot_face:'). Overrides `icon_url`. Applies if `as_user` is `false`.",
+                            "examples": [
+                                ":tada:",
+                                ":slack:"
+                            ],
+                            "title": "Icon Emoji",
+                            "type": "string"
+                        },
+                        "icon_url": {
+                            "description": "Image URL for bot's icon (must be HTTPS). Applies if `as_user` is `false`.",
+                            "examples": [
+                                "https://slack.com/img/icons/appDir_2019_01/Tonito64.png"
+                            ],
+                            "title": "Icon Url",
+                            "type": "string"
+                        },
+                        "link_names": {
+                            "description": "Automatically hyperlink channel names (e.g., #channel) and usernames (e.g., @user) in message text. Defaults to `false` for bot messages.",
+                            "title": "Link Names",
+                            "type": "boolean"
+                        },
+                        "markdown_text": {
+                            "description": "PREFERRED: Write your message in markdown for nicely formatted display. Supports: headers (# ## ###), bold (**text** or __text__), italic (*text* or _text_), strikethrough (~~text~~), inline code (`code`), code blocks (```), links ([text](url)), block quotes (>), lists (- item, 1. item), dividers (--- or ***), context blocks (:::context with images), and section buttons (:::section-button). IMPORTANT: Use \\n for line breaks (e.g., 'Line 1\\nLine 2'), not actual newlines. USER MENTIONS: To tag users, use their user ID with <@USER_ID> format (e.g., <@U1234567890>), not username. ",
+                            "examples": [
+                                "# Status Update\n\nSystem is **running smoothly** with *excellent* performance.\n\n```bash\nkubectl get pods\n```\n\n> All services operational ✅",
+                                "## Daily Report\n\n- **Deployments**: 5 successful\n- *Issues*: 0 critical\n- ~~Maintenance~~: **Completed**\n\n---\n\n**Next**: Monitor for 24h"
+                            ],
+                            "title": "Markdown Text",
+                            "type": "string"
+                        },
+                        "mrkdwn": {
+                            "description": "Disable Slack's markdown for `text` field if `false`. Default `true` (allows *bold*, _italic_, etc.).",
+                            "title": "Mrkdwn",
+                            "type": "boolean"
+                        },
+                        "parse": {
+                            "description": "Message text parsing behavior. Default `none` (no special parsing). `full` parses as user-typed (links @mentions, #channels). See Slack API docs for details.",
+                            "examples": [
+                                "none",
+                                "full"
+                            ],
+                            "title": "Parse",
+                            "type": "string"
+                        },
+                        "reply_broadcast": {
+                            "description": "If `true` for a threaded reply, also posts to main channel. Defaults to `false`.",
+                            "title": "Reply Broadcast",
+                            "type": "boolean"
+                        },
+                        "text": {
+                            "description": "DEPRECATED: This sends raw text only, use markdown_text field. Primary textual content. Recommended fallback if using `blocks` or `attachments`. Supports mrkdwn unless `mrkdwn` is `false`.",
+                            "examples": [
+                                "Hello from your friendly bot!",
+                                "Reminder: Team meeting at 3 PM today."
+                            ],
+                            "title": "Text",
+                            "type": "string"
+                        },
+                        "thread_ts": {
+                            "description": "Timestamp (`ts`) of an existing message to make this a threaded reply. Use `ts` of the parent message, not another reply. Example: '1476746824.000004'.",
+                            "examples": [
+                                "1618033790.001500"
+                            ],
+                            "title": "Thread Ts",
+                            "type": "string"
+                        },
+                        "unfurl_links": {
+                            "description": "Enable unfurling of text-based URLs. Defaults `false` for bots, `true` if `as_user` is `true`.",
+                            "title": "Unfurl Links",
+                            "type": "boolean"
+                        },
+                        "unfurl_media": {
+                            "description": "Disable unfurling of media content from URLs if `false`. Defaults to `true`.",
+                            "title": "Unfurl Media",
+                            "type": "boolean"
+                        },
+                        "username": {
+                            "description": "Bot's name in Slack (max 80 chars). Applies if `as_user` is `false`.",
+                            "examples": [
+                                "MyBot",
+                                "AlertBot"
+                            ],
+                            "title": "Username",
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "channel"
+                    ]
+                },
+                "isComposio": true,
+                "composioData": {
+                    "slug": "SLACK_SENDS_A_MESSAGE_TO_A_SLACK_CHANNEL",
+                    "noAuth": false,
+                    "toolkitName": "Slack",
+                    "toolkitSlug": "slack",
+                    "logo": "https://cdn.jsdelivr.net/gh/ComposioHQ/open-logos@master/slack.svg"
+                }
+            }
+        ],
+        "pipelines": [
+            {
+                "name": "GitHub Stats Logging Pipeline",
+                "description": "Sequential pipeline to fetch GitHub stats, log them to a Google Sheet, and notify #stats Slack channel.",
+                "agents": [
+                    "Pipeline Step 1 - Fetch Views Data",
+                    "Pipeline Step 2 - Fetch Clones Data",
+                    "Pipeline Step 3 - Add Data to Sheet",
+                    "Pipeline Step 4 - Send Slack Summary"
+                ]
+            }
+        ],
+        "startAgent": "GitHub Stats Pipeline Hub"
     }
 }
 

From 2c3016f143ed33f970d94aa4dcf76cc97a7895be Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Fri, 22 Aug 2025 17:45:09 +0530
Subject: [PATCH 12/15] improve agents-sdk message handling

---
 .../application/lib/agents-runtime/agents.ts  | 53 ++++++++++++++-----
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/apps/rowboat/src/application/lib/agents-runtime/agents.ts b/apps/rowboat/src/application/lib/agents-runtime/agents.ts
index 0c632c6b..4d2a7e84 100644
--- a/apps/rowboat/src/application/lib/agents-runtime/agents.ts
+++ b/apps/rowboat/src/application/lib/agents-runtime/agents.ts
@@ -747,29 +747,44 @@ function maybeInjectGiveUpControlInstructions(
 async function* handleRawModelStreamEvent(
     event: RunRawModelStreamEvent,
     agentConfig: Record<string, z.infer<typeof WorkflowAgent>>,
+    pipelineConfig: Record<string, z.infer<typeof WorkflowPipeline>>,
     agentName: string,
     turnMsgs: z.infer<typeof Message>[],
     usageTracker: UsageTracker,
     eventLogger: PrefixLogger,
     getAgentState?: (agentName: string) => AgentState
 ): AsyncIterable<z.infer<typeof ZOutMessage>> {
+    // check response visibility - could be an agent or pipeline
+    const agentConfigObj = agentConfig[agentName];
+    const pipelineConfigObj = pipelineConfig[agentName];
+    const isInternal = agentConfigObj?.outputVisibility === 'internal' || agentConfigObj?.type === 'pipeline' || !!pipelineConfigObj;
+
     if (event.data.type === 'response_done') {
-        // Count tool calls (excluding transfer_to_* calls)
-        const toolCallCount = event.data.response.output.filter(
-            (output: any) => output.type === 'function_call' && !output.name.startsWith('transfer_to')
-        ).length;
-        
-        // If we have tool calls, increment pending counter
-        if (toolCallCount > 0 && getAgentState) {
-            const state = getAgentState(agentName);
-            state.pendingToolCalls += toolCallCount;
-            eventLogger.log(`🔧 Agent ${agentName} has ${toolCallCount} new tool calls (total: ${state.pendingToolCalls})`);
-        }
-        
         for (const output of event.data.response.output) {
+            if (output.type === 'message') {
+                for (const c of output.content) {
+                    if (c.type === 'output_text' && c.text.trim()) {
+                        const m: z.infer<typeof Message> = {
+                            role: 'assistant',
+                            content: c.text,
+                            agentName: agentName,
+                            responseType: isInternal ? 'internal' : 'external',
+                        };
+                        turnMsgs.push(m);
+                        yield* emitEvent(eventLogger, m);
+                    }
+                }
+            }
+
             // handle tool call invocation
             // except for transfer_to_* tool calls
             if (output.type === 'function_call' && !output.name.startsWith('transfer_to')) {
+                if (getAgentState) {
+                    const state = getAgentState(agentName);
+                    state.pendingToolCalls++;
+                    eventLogger.log(`🔧 Agent ${agentName} has ${state.pendingToolCalls} pending tool calls`);
+                }
+
                 const m: z.infer<typeof Message> = {
                     role: 'assistant',
                     content: null,
@@ -1030,6 +1045,7 @@ async function* handleMessageOutput(
     const pipelineConfigObj = pipelineConfig[agentName];
     const isInternal = agentConfigObj?.outputVisibility === 'internal' || agentConfigObj?.type === 'pipeline' || !!pipelineConfigObj;
 
+    /* ignore handling text messages here in favor of handling raw events
     for (const content of event.item.rawItem.content) {
         if (content.type === 'output_text') {
             // todo: look into what is causing empty messages
@@ -1054,6 +1070,7 @@ async function* handleMessageOutput(
             yield* emitEvent(eventLogger, msg);
         }
     }
+    */
 
     // if this is an internal agent or pipeline agent, switch to previous agent
     if (isInternal) {
@@ -1372,10 +1389,20 @@ export async function* streamResponse(
         // handle streaming events
         for await (const event of result) {
             const eventLogger = loopLogger.child(event.type);
+            eventLogger.log(`*** GOT EVENT ***`, JSON.stringify(event));
 
             switch (event.type) {
                 case 'raw_model_stream_event':
-                    yield* handleRawModelStreamEvent(event, agentConfig, agentName!, turnMsgs, usageTracker, eventLogger, getAgentState);
+                    yield* handleRawModelStreamEvent(
+                        event,
+                        agentConfig,
+                        pipelineConfig,
+                        agentName!,
+                        turnMsgs,
+                        usageTracker,
+                        eventLogger,
+                        getAgentState,
+                    );
                     break;
 
                 case 'run_item_stream_event':

From eac001527cad05e39d8322376b4bafff3ee451ca Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Fri, 22 Aug 2025 18:39:31 +0530
Subject: [PATCH 13/15] close eventsource on chat unmount

---
 .../[projectId]/playground/components/chat.tsx         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps/rowboat/app/projects/[projectId]/playground/components/chat.tsx b/apps/rowboat/app/projects/[projectId]/playground/components/chat.tsx
index e14229e0..5f634bdc 100644
--- a/apps/rowboat/app/projects/[projectId]/playground/components/chat.tsx
+++ b/apps/rowboat/app/projects/[projectId]/playground/components/chat.tsx
@@ -160,6 +160,16 @@ export function Chat({
         setIsLastInteracted(true);
     }
 
+    // clean up event source on component unmount
+    useEffect(() => {
+        return () => {
+            if (eventSourceRef.current) {
+                eventSourceRef.current.close();
+                eventSourceRef.current = null;
+            }
+        }
+    }, []);
+
     useEffect(() => {
         const container = scrollContainerRef.current;
         if (!container) return;

From 219d4c790182dca4088f726ed157a0403f1a9e5f Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Sat, 23 Aug 2025 08:15:58 +0530
Subject: [PATCH 14/15] ddd: create users repository

---
 apps/rowboat/app/actions/auth.actions.ts      | 19 ++---
 apps/rowboat/app/actions/composio.actions.ts  | 22 ++---
 .../app/actions/conversation.actions.ts       |  4 +-
 .../app/actions/custom-mcp-server.actions.ts  |  4 +-
 .../app/actions/data-source.actions.ts        | 24 +++---
 apps/rowboat/app/actions/job.actions.ts       |  4 +-
 .../app/actions/playground-chat.actions.ts    |  4 +-
 apps/rowboat/app/actions/project.actions.ts   | 30 +++----
 .../actions/recurring-job-rules.actions.ts    | 10 +--
 .../actions/scheduled-job-rules.actions.ts    |  8 +-
 .../api/stream-response/[streamId]/route.ts   |  2 +-
 apps/rowboat/app/lib/auth.ts                  | 51 ++++--------
 apps/rowboat/app/lib/billing.ts               | 27 +++---
 apps/rowboat/app/lib/mongodb.ts               |  2 -
 apps/rowboat/app/lib/types/types.ts           |  9 --
 .../projects/[projectId]/workflow/page.tsx    |  4 +-
 apps/rowboat/di/container.ts                  |  7 ++
 .../users.repository.interface.ts             | 19 +++++
 apps/rowboat/src/entities/models/user.ts      | 11 +++
 .../infrastructure/mongodb/drop-indexes.ts    |  2 +
 .../infrastructure/mongodb/ensure-indexes.ts  |  2 +
 .../repositories/mongodb.users.indexes.ts     |  7 ++
 .../repositories/mongodb.users.repository.ts  | 82 +++++++++++++++++++
 23 files changed, 220 insertions(+), 134 deletions(-)
 create mode 100644 apps/rowboat/src/application/repositories/users.repository.interface.ts
 create mode 100644 apps/rowboat/src/entities/models/user.ts
 create mode 100644 apps/rowboat/src/infrastructure/repositories/mongodb.users.indexes.ts
 create mode 100644 apps/rowboat/src/infrastructure/repositories/mongodb.users.repository.ts

diff --git a/apps/rowboat/app/actions/auth.actions.ts b/apps/rowboat/app/actions/auth.actions.ts
index 14b483e4..584772ce 100644
--- a/apps/rowboat/app/actions/auth.actions.ts
+++ b/apps/rowboat/app/actions/auth.actions.ts
@@ -1,13 +1,15 @@
 "use server";
 import { auth0 } from "../lib/auth0";
 import { USE_AUTH } from "../lib/feature_flags";
-import { WithStringId, User } from "../lib/types/types";
+import { User } from "@/src/entities/models/user";
 import { getUserFromSessionId, GUEST_DB_USER } from "../lib/auth";
 import { z } from "zod";
-import { ObjectId } from "mongodb";
-import { usersCollection } from "../lib/mongodb";
+import { container } from "@/di/container";
+import { IUsersRepository } from "@/src/application/repositories/users.repository.interface";
 
-export async function authCheck(): Promise<WithStringId<z.infer<typeof User>>> {
+const usersRepository = container.resolve<IUsersRepository>("usersRepository");
+
+export async function authCheck(): Promise<z.infer<typeof User>> {
     if (!USE_AUTH) {
         return GUEST_DB_USER;
     }
@@ -42,12 +44,5 @@ export async function updateUserEmail(email: string) {
     }
 
     // update customer email in db
-    await usersCollection.updateOne({
-        _id: new ObjectId(user._id),
-    }, {
-        $set: {
-            email,
-            updatedAt: new Date().toISOString(),
-        }
-    });
+    await usersRepository.updateEmail(user.id, email);
 }
diff --git a/apps/rowboat/app/actions/composio.actions.ts b/apps/rowboat/app/actions/composio.actions.ts
index 5609cf3c..daddc930 100644
--- a/apps/rowboat/app/actions/composio.actions.ts
+++ b/apps/rowboat/app/actions/composio.actions.ts
@@ -49,7 +49,7 @@ export async function listToolkits(projectId: string, cursor: string | null = nu
     const user = await authCheck();
     return await listComposioToolkitsController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         cursor,
     });
@@ -59,7 +59,7 @@ export async function getToolkit(projectId: string, toolkitSlug: string): Promis
     const user = await authCheck();
     return await getComposioToolkitController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         toolkitSlug,
     });
@@ -69,7 +69,7 @@ export async function listTools(projectId: string, toolkitSlug: string, searchQu
     const user = await authCheck();
     return await listComposioToolsController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         toolkitSlug,
         searchQuery,
@@ -81,7 +81,7 @@ export async function createComposioManagedOauth2ConnectedAccount(projectId: str
     const user = await authCheck();
     return await createComposioManagedConnectedAccountController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         toolkitSlug,
         callbackUrl,
@@ -92,7 +92,7 @@ export async function createCustomConnectedAccount(projectId: string, request: z
     const user = await authCheck();
     return await createCustomConnectedAccountController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         toolkitSlug: request.toolkitSlug,
         authConfig: request.authConfig,
@@ -104,7 +104,7 @@ export async function syncConnectedAccount(projectId: string, toolkitSlug: strin
     const user = await authCheck();
     return await syncConnectedAccountController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         toolkitSlug,
         connectedAccountId,
@@ -116,7 +116,7 @@ export async function deleteConnectedAccount(projectId: string, toolkitSlug: str
 
     await deleteComposioConnectedAccountController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         toolkitSlug,
     });
@@ -144,7 +144,7 @@ export async function createComposioTriggerDeployment(request: {
     // create trigger deployment
     return await createComposioTriggerDeploymentController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         data: {
             triggerTypeSlug: request.triggerTypeSlug,
@@ -163,7 +163,7 @@ export async function listComposioTriggerDeployments(request: {
     // list trigger deployments
     return await listComposioTriggerDeploymentsController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         cursor: request.cursor,
     });
@@ -178,7 +178,7 @@ export async function deleteComposioTriggerDeployment(request: {
     // delete trigger deployment
     return await deleteComposioTriggerDeploymentController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         deploymentId: request.deploymentId,
     });
@@ -188,7 +188,7 @@ export async function fetchComposioTriggerDeployment(request: { deploymentId: st
     const user = await authCheck();
     return await fetchComposioTriggerDeploymentController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         deploymentId: request.deploymentId,
     });
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/actions/conversation.actions.ts b/apps/rowboat/app/actions/conversation.actions.ts
index 74389125..68f33fea 100644
--- a/apps/rowboat/app/actions/conversation.actions.ts
+++ b/apps/rowboat/app/actions/conversation.actions.ts
@@ -17,7 +17,7 @@ export async function listConversations(request: {
 
     return await listConversationsController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         cursor: request.cursor,
         limit: request.limit,
@@ -31,7 +31,7 @@ export async function fetchConversation(request: {
 
     return await fetchConversationController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         conversationId: request.conversationId,
     });
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/actions/custom-mcp-server.actions.ts b/apps/rowboat/app/actions/custom-mcp-server.actions.ts
index 265f9673..0ce2e567 100644
--- a/apps/rowboat/app/actions/custom-mcp-server.actions.ts
+++ b/apps/rowboat/app/actions/custom-mcp-server.actions.ts
@@ -32,7 +32,7 @@ export async function addServer(projectId: string, name: string, server: McpServ
   validateUrl(server.serverUrl);
   await addCustomMcpServerController.execute({
     caller: 'user',
-    userId: user._id,
+    userId: user.id,
     projectId,
     name,
     server,
@@ -43,7 +43,7 @@ export async function removeServer(projectId: string, name: string): Promise<voi
   const user = await authCheck();
   await removeCustomMcpServerController.execute({
     caller: 'user',
-    userId: user._id,
+    userId: user.id,
     projectId,
     name,
   });
diff --git a/apps/rowboat/app/actions/data-source.actions.ts b/apps/rowboat/app/actions/data-source.actions.ts
index 4c7b75fc..97385f4f 100644
--- a/apps/rowboat/app/actions/data-source.actions.ts
+++ b/apps/rowboat/app/actions/data-source.actions.ts
@@ -35,7 +35,7 @@ export async function getDataSource(sourceId: string): Promise<z.infer<typeof Da
 
     return await fetchDataSourceController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         sourceId,
     });
 }
@@ -45,7 +45,7 @@ export async function listDataSources(projectId: string): Promise<z.infer<typeof
 
     return await listDataSourcesController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
     });
 }
@@ -66,7 +66,7 @@ export async function createDataSource({
     const user = await authCheck();
     return await createDataSourceController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         data: {
             projectId,
             name,
@@ -82,7 +82,7 @@ export async function recrawlWebDataSource(sourceId: string) {
 
     return await recrawlWebDataSourceController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         sourceId,
     });
 }
@@ -92,7 +92,7 @@ export async function deleteDataSource(sourceId: string) {
 
     return await deleteDataSourceController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         sourceId,
     });
 }
@@ -102,7 +102,7 @@ export async function toggleDataSource(sourceId: string, active: boolean) {
 
     return await toggleDataSourceController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         sourceId,
         active,
     });
@@ -122,7 +122,7 @@ export async function addDocsToDataSource({
 
     return await addDocsToDataSourceController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         sourceId,
         docs: docData,
     });
@@ -144,7 +144,7 @@ export async function listDocsInDataSource({
 
     const docs = await listDocsInDataSourceController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         sourceId,
     });
 
@@ -162,7 +162,7 @@ export async function deleteDocFromDataSource({
     const user = await authCheck();
     return await deleteDocFromDataSourceController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         docId,
     });
 }
@@ -174,7 +174,7 @@ export async function getDownloadUrlForFile(
 
     return await getDownloadUrlForFileController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         fileId,
     });
 }
@@ -191,7 +191,7 @@ export async function getUploadUrlsForFilesDataSource(
 
     return await getUploadUrlsForFilesController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         sourceId,
         files,
     });
@@ -208,7 +208,7 @@ export async function updateDataSource({
 
     return await updateDataSourceController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         sourceId,
         data: {
             description,
diff --git a/apps/rowboat/app/actions/job.actions.ts b/apps/rowboat/app/actions/job.actions.ts
index 4c548ad0..410bd526 100644
--- a/apps/rowboat/app/actions/job.actions.ts
+++ b/apps/rowboat/app/actions/job.actions.ts
@@ -20,7 +20,7 @@ export async function listJobs(request: {
 
     return await listJobsController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         filters: request.filters,
         cursor: request.cursor,
@@ -35,7 +35,7 @@ export async function fetchJob(request: {
 
     return await fetchJobController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         jobId: request.jobId,
     });
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/actions/playground-chat.actions.ts b/apps/rowboat/app/actions/playground-chat.actions.ts
index 9df59838..d54bad5c 100644
--- a/apps/rowboat/app/actions/playground-chat.actions.ts
+++ b/apps/rowboat/app/actions/playground-chat.actions.ts
@@ -22,7 +22,7 @@ export async function createConversation({
     const controller = container.resolve<ICreatePlaygroundConversationController>("createPlaygroundConversationController");
 
     return await controller.execute({
-        userId: user._id,
+        userId: user.id,
         projectId,
         workflow,
         isLiveWorkflow,
@@ -41,7 +41,7 @@ export async function createCachedTurn({
 
     const { key } = await createCachedTurnController.execute({
         caller: "user",
-        userId: user._id,
+        userId: user.id,
         conversationId,
         input: {
             messages,
diff --git a/apps/rowboat/app/actions/project.actions.ts b/apps/rowboat/app/actions/project.actions.ts
index a11d8430..5f042694 100644
--- a/apps/rowboat/app/actions/project.actions.ts
+++ b/apps/rowboat/app/actions/project.actions.ts
@@ -57,7 +57,7 @@ export async function projectAuthCheck(projectId: string) {
     const user = await authCheck();
     await projectActionAuthorizationPolicy.authorize({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
     });
 }
@@ -69,7 +69,7 @@ export async function createProject(formData: FormData): Promise<{ id: string }
 
     try {
         const project = await createProjectController.execute({
-            userId: user._id,
+            userId: user.id,
             data: {
                 name: name || '',
                 mode: {
@@ -94,7 +94,7 @@ export async function createProjectFromWorkflowJson(formData: FormData): Promise
 
     try {
         const project = await createProjectController.execute({
-            userId: user._id,
+            userId: user.id,
             data: {
                 name: name || '',
                 mode: {
@@ -116,7 +116,7 @@ export async function fetchProject(projectId: string): Promise<z.infer<typeof Pr
     const user = await authCheck();
     const project = await fetchProjectController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
     });
 
@@ -134,7 +134,7 @@ export async function listProjects(): Promise<z.infer<typeof Project>[]> {
     let cursor = undefined;
     do {
         const result = await listProjectsController.execute({
-            userId: user._id,
+            userId: user.id,
             cursor,
         });
         projects.push(...result.items);
@@ -148,7 +148,7 @@ export async function rotateSecret(projectId: string): Promise<string> {
     const user = await authCheck();
     return await rotateSecretController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
     });
 }
@@ -157,7 +157,7 @@ export async function updateWebhookUrl(projectId: string, url: string) {
     const user = await authCheck();
     await updateWebhookUrlController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         url,
     });
@@ -167,7 +167,7 @@ export async function createApiKey(projectId: string): Promise<z.infer<typeof Ap
     const user = await authCheck();
     return await createApiKeyController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
     });
 }
@@ -176,7 +176,7 @@ export async function deleteApiKey(projectId: string, id: string) {
     const user = await authCheck();
     return await deleteApiKeyController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         id,
     });
@@ -186,7 +186,7 @@ export async function listApiKeys(projectId: string): Promise<z.infer<typeof Api
     const user = await authCheck();
     return await listApiKeysController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
     });
 }
@@ -195,7 +195,7 @@ export async function updateProjectName(projectId: string, name: string) {
     const user = await authCheck();
     await updateProjectNameController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         name,
     });
@@ -205,7 +205,7 @@ export async function deleteProject(projectId: string) {
     const user = await authCheck();
     await deleteProjectController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
     });
 
@@ -216,7 +216,7 @@ export async function saveWorkflow(projectId: string, workflow: z.infer<typeof W
     const user = await authCheck();
     await updateDraftWorkflowController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         workflow,
     });
@@ -226,7 +226,7 @@ export async function publishWorkflow(projectId: string, workflow: z.infer<typeo
     const user = await authCheck();
     await updateLiveWorkflowController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
         workflow,
     });
@@ -236,7 +236,7 @@ export async function revertToLiveWorkflow(projectId: string) {
     const user = await authCheck();
     await revertToLiveWorkflowController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId,
     });
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/actions/recurring-job-rules.actions.ts b/apps/rowboat/app/actions/recurring-job-rules.actions.ts
index 97c16f08..d64264d8 100644
--- a/apps/rowboat/app/actions/recurring-job-rules.actions.ts
+++ b/apps/rowboat/app/actions/recurring-job-rules.actions.ts
@@ -27,7 +27,7 @@ export async function createRecurringJobRule(request: {
 
     return await createRecurringJobRuleController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         input: request.input,
         cron: request.cron,
@@ -43,7 +43,7 @@ export async function listRecurringJobRules(request: {
 
     return await listRecurringJobRulesController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         cursor: request.cursor,
         limit: request.limit,
@@ -57,7 +57,7 @@ export async function fetchRecurringJobRule(request: {
 
     return await fetchRecurringJobRuleController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         ruleId: request.ruleId,
     });
 }
@@ -70,7 +70,7 @@ export async function toggleRecurringJobRule(request: {
 
     return await toggleRecurringJobRuleController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         ruleId: request.ruleId,
         disabled: request.disabled,
     });
@@ -84,7 +84,7 @@ export async function deleteRecurringJobRule(request: {
 
     return await deleteRecurringJobRuleController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         ruleId: request.ruleId,
     });
diff --git a/apps/rowboat/app/actions/scheduled-job-rules.actions.ts b/apps/rowboat/app/actions/scheduled-job-rules.actions.ts
index 47f61f78..640c4e08 100644
--- a/apps/rowboat/app/actions/scheduled-job-rules.actions.ts
+++ b/apps/rowboat/app/actions/scheduled-job-rules.actions.ts
@@ -25,7 +25,7 @@ export async function createScheduledJobRule(request: {
 
     return await createScheduledJobRuleController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         input: request.input,
         scheduledTime: request.scheduledTime,
@@ -41,7 +41,7 @@ export async function listScheduledJobRules(request: {
 
     return await listScheduledJobRulesController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         cursor: request.cursor,
         limit: request.limit,
@@ -55,7 +55,7 @@ export async function fetchScheduledJobRule(request: {
 
     return await fetchScheduledJobRuleController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         ruleId: request.ruleId,
     });
 }
@@ -68,7 +68,7 @@ export async function deleteScheduledJobRule(request: {
 
     return await deleteScheduledJobRuleController.execute({
         caller: 'user',
-        userId: user._id,
+        userId: user.id,
         projectId: request.projectId,
         ruleId: request.ruleId,
     });
diff --git a/apps/rowboat/app/api/stream-response/[streamId]/route.ts b/apps/rowboat/app/api/stream-response/[streamId]/route.ts
index 17c1a8d8..0a0920fa 100644
--- a/apps/rowboat/app/api/stream-response/[streamId]/route.ts
+++ b/apps/rowboat/app/api/stream-response/[streamId]/route.ts
@@ -22,7 +22,7 @@ export async function GET(request: Request, props: { params: Promise<{ streamId:
                 // Iterate over the generator
                 for await (const event of runCachedTurnController.execute({
                     caller: "user",
-                    userId: user._id,
+                    userId: user.id,
                     cachedTurnKey: params.streamId,
                 })) {
                     controller.enqueue(encoder.encode(`event: message\ndata: ${JSON.stringify(event)}\n\n`));
diff --git a/apps/rowboat/app/lib/auth.ts b/apps/rowboat/app/lib/auth.ts
index f71ab537..302202dc 100644
--- a/apps/rowboat/app/lib/auth.ts
+++ b/apps/rowboat/app/lib/auth.ts
@@ -1,10 +1,10 @@
 import { z } from "zod";
-import { ObjectId } from "mongodb";
-import { usersCollection } from "./mongodb";
 import { auth0 } from "./auth0";
-import { User, WithStringId } from "./types/types";
+import { User } from "@/src/entities/models/user";
 import { USE_AUTH } from "./feature_flags";
 import { redirect } from "next/navigation";
+import { container } from "@/di/container";
+import { IUsersRepository } from "@/src/application/repositories/users.repository.interface";
 
 export const GUEST_SESSION = {
     email: "guest@rowboatlabs.com",
@@ -12,13 +12,12 @@ export const GUEST_SESSION = {
     sub: "guest_user",
 }
 
-export const GUEST_DB_USER: WithStringId<z.infer<typeof User>> = {
-    _id: "guest_user",
+export const GUEST_DB_USER: z.infer<typeof User> = {
+    id: "guest_user",
     auth0Id: "guest_user",
     name: "Guest",
     email: "guest@rowboatlabs.com",
     createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
 }
 
 /**
@@ -33,7 +32,7 @@ export const GUEST_DB_USER: WithStringId<z.infer<typeof User>> = {
  * const user = await requireAuth();
  * ```
  */
-export async function requireAuth(): Promise<WithStringId<z.infer<typeof User>>> {
+export async function requireAuth(): Promise<z.infer<typeof User>> {
     if (!USE_AUTH) {
         return GUEST_DB_USER;
     }
@@ -44,48 +43,26 @@ export async function requireAuth(): Promise<WithStringId<z.infer<typeof User>>>
     }
 
     // fetch db user
+    const usersRepository = container.resolve<IUsersRepository>("usersRepository");
     let dbUser = await getUserFromSessionId(user.sub);
 
     // if db user does not exist, create one
     if (!dbUser) {
-        // create user record
-        const doc = {
-            _id: new ObjectId(),
+        dbUser = await usersRepository.create({
             auth0Id: user.sub,
-            createdAt: new Date().toISOString(),
-            updatedAt: new Date().toISOString(),
             email: user.email,
-        };
-        console.log(`creating new user id ${doc._id.toString()} for session id ${user.sub}`);
-        await usersCollection.insertOne(doc);
-
-        dbUser = {
-            ...doc,
-            _id: doc._id.toString(),
-        };
+        });
+        console.log(`created new user id ${dbUser.id} for session id ${user.sub}`);
     }
 
-    const { _id, ...rest } = dbUser;
-    return {
-        ...rest,
-        _id: _id.toString(),
-    };
+    return dbUser;
 }
 
-export async function getUserFromSessionId(sessionUserId: string): Promise<WithStringId<z.infer<typeof User>> | null> {
+export async function getUserFromSessionId(sessionUserId: string): Promise<z.infer<typeof User> | null> {
     if (!USE_AUTH) {
         return GUEST_DB_USER;
     }
 
-    let dbUser = await usersCollection.findOne({
-        auth0Id: sessionUserId
-    });
-    if (!dbUser) {
-        return null;
-    }
-    const { _id, ...rest } = dbUser;
-    return {
-        ...rest,
-        _id: _id.toString(),
-    };
+    const usersRepository = container.resolve<IUsersRepository>("usersRepository");
+    return await usersRepository.fetchByAuth0Id(sessionUserId);
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/lib/billing.ts b/apps/rowboat/app/lib/billing.ts
index 538f3992..7a0c00ee 100644
--- a/apps/rowboat/app/lib/billing.ts
+++ b/apps/rowboat/app/lib/billing.ts
@@ -1,13 +1,12 @@
 import { WithStringId } from './types/types';
 import { z } from 'zod';
 import { Customer, AuthorizeRequest, AuthorizeResponse, LogUsageRequest, UsageResponse, CustomerPortalSessionResponse, PricesResponse, UpdateSubscriptionPlanRequest, UpdateSubscriptionPlanResponse, ModelsResponse, UsageItem } from './types/billing_types';
-import { ObjectId } from 'mongodb';
-import { usersCollection } from './mongodb';
 import { redirect } from 'next/navigation';
 import { getUserFromSessionId, requireAuth } from './auth';
 import { USE_BILLING } from './feature_flags';
 import { container } from '@/di/container';
 import { IProjectsRepository } from '@/src/application/repositories/projects.repository.interface';
+import { IUsersRepository } from '@/src/application/repositories/users.repository.interface';
 
 const BILLING_API_URL = process.env.BILLING_API_URL || 'http://billing';
 const BILLING_API_KEY = process.env.BILLING_API_KEY || 'test';
@@ -27,6 +26,7 @@ const GUEST_BILLING_CUSTOMER = {
     updatedAt: new Date().toISOString(),
 };
 
+
 export class UsageTracker{
     private items: z.infer<typeof UsageItem>[] = [];
 
@@ -42,7 +42,9 @@ export class UsageTracker{
 }
 
 export async function getCustomerForUserId(userId: string): Promise<WithStringId<z.infer<typeof Customer>> | null> {
-    const user = await usersCollection.findOne({ _id: new ObjectId(userId) });
+    const usersRepository = container.resolve<IUsersRepository>("usersRepository");
+
+    const user = await usersRepository.fetch(userId);
     if (!user) {
         throw new Error("User not found");
     }
@@ -266,11 +268,12 @@ export async function getEligibleModels(customerId: string): Promise<z.infer<typ
  */
 export async function requireBillingCustomer(): Promise<WithStringId<z.infer<typeof Customer>>> {
     const user = await requireAuth();
+    const usersRepository = container.resolve<IUsersRepository>("usersRepository");
 
     if (!USE_BILLING) {
         return {
             ...GUEST_BILLING_CUSTOMER,
-            userId: user._id,
+            userId: user.id,
         };
     }
 
@@ -284,18 +287,11 @@ export async function requireBillingCustomer(): Promise<WithStringId<z.infer<typ
     if (user.billingCustomerId) {
         customer = await getBillingCustomer(user.billingCustomerId);
     } else {
-        customer = await createBillingCustomer(user._id, user.email);
-        console.log("created billing customer", JSON.stringify({ userId: user._id, customer }));
+        customer = await createBillingCustomer(user.id, user.email);
+        console.log("created billing customer", JSON.stringify({ userId: user.id, customer }));
 
         // update customer id in db
-        await usersCollection.updateOne({
-            _id: new ObjectId(user._id),
-        }, {
-            $set: {
-                billingCustomerId: customer._id,
-                updatedAt: new Date().toISOString(),
-            }
-        });
+        await usersRepository.updateBillingCustomerId(user.id, customer._id);
     }
     if (!customer) {
         throw new Error("Failed to fetch or create billing customer");
@@ -323,5 +319,4 @@ export async function requireActiveBillingSubscription(): Promise<WithStringId<z
         redirect('/billing');
     }
     return billingCustomer;
-}
-
+}
\ No newline at end of file
diff --git a/apps/rowboat/app/lib/mongodb.ts b/apps/rowboat/app/lib/mongodb.ts
index e397e83a..a92e795b 100644
--- a/apps/rowboat/app/lib/mongodb.ts
+++ b/apps/rowboat/app/lib/mongodb.ts
@@ -1,5 +1,4 @@
 import { MongoClient } from "mongodb";
-import { User } from "./types/types";
 import { TwilioConfig, TwilioInboundCall } from "./types/voice_types";
 import { z } from 'zod';
 import { apiV1 } from "rowboat-shared";
@@ -10,7 +9,6 @@ export const db = client.db("rowboat");
 export const chatsCollection = db.collection<z.infer<typeof apiV1.Chat>>("chats");
 export const chatMessagesCollection = db.collection<z.infer<typeof apiV1.ChatMessage>>("chat_messages");
 export const twilioConfigsCollection = db.collection<z.infer<typeof TwilioConfig>>("twilio_configs");
-export const usersCollection = db.collection<z.infer<typeof User>>("users");
 export const twilioInboundCallsCollection = db.collection<z.infer<typeof TwilioInboundCall>>("twilio_inbound_calls");
 
 // Create indexes
diff --git a/apps/rowboat/app/lib/types/types.ts b/apps/rowboat/app/lib/types/types.ts
index ab9de57a..6023ab13 100644
--- a/apps/rowboat/app/lib/types/types.ts
+++ b/apps/rowboat/app/lib/types/types.ts
@@ -124,15 +124,6 @@ export const McpServerResponse = z.object({
     error: z.string().nullable(),
 });
 
-export const User = z.object({
-    auth0Id: z.string(),
-    billingCustomerId: z.string().optional(),
-    name: z.string().optional(),
-    email: z.string().optional(),
-    createdAt: z.string().datetime(),
-    updatedAt: z.string().datetime(),
-});
-
 export const Webpage = z.object({
     _id: z.string(),
     title: z.string(),
diff --git a/apps/rowboat/app/projects/[projectId]/workflow/page.tsx b/apps/rowboat/app/projects/[projectId]/workflow/page.tsx
index 4c9ea94a..008f4317 100644
--- a/apps/rowboat/app/projects/[projectId]/workflow/page.tsx
+++ b/apps/rowboat/app/projects/[projectId]/workflow/page.tsx
@@ -32,7 +32,7 @@ export default async function Page(
 
     const project = await fetchProjectController.execute({
         caller: "user",
-        userId: user._id,
+        userId: user.id,
         projectId: params.projectId,
     });
     if (!project) {
@@ -41,7 +41,7 @@ export default async function Page(
 
     const sources = await listDataSourcesController.execute({
         caller: "user",
-        userId: user._id,
+        userId: user.id,
         projectId: params.projectId,
     });
 
diff --git a/apps/rowboat/di/container.ts b/apps/rowboat/di/container.ts
index f2af8a95..be9bf344 100644
--- a/apps/rowboat/di/container.ts
+++ b/apps/rowboat/di/container.ts
@@ -145,6 +145,9 @@ import { UpdateLiveWorkflowController } from "@/src/interface-adapters/controlle
 import { RevertToLiveWorkflowUseCase } from "@/src/application/use-cases/projects/revert-to-live-workflow.use-case";
 import { RevertToLiveWorkflowController } from "@/src/interface-adapters/controllers/projects/revert-to-live-workflow.controller";
 
+// users
+import { MongoDBUsersRepository } from "@/src/infrastructure/repositories/mongodb.users.repository";
+
 export const container = createContainer({
     injectionMode: InjectionMode.PROXY,
     strict: true,
@@ -324,4 +327,8 @@ container.register({
     runTurnController: asClass(RunTurnController).singleton(),
     listConversationsController: asClass(ListConversationsController).singleton(),
     fetchConversationController: asClass(FetchConversationController).singleton(),
+
+    // users
+    // ---
+    usersRepository: asClass(MongoDBUsersRepository).singleton(),
 });
\ No newline at end of file
diff --git a/apps/rowboat/src/application/repositories/users.repository.interface.ts b/apps/rowboat/src/application/repositories/users.repository.interface.ts
new file mode 100644
index 00000000..64684fb1
--- /dev/null
+++ b/apps/rowboat/src/application/repositories/users.repository.interface.ts
@@ -0,0 +1,19 @@
+import { z } from "zod";
+import { User } from "@/src/entities/models/user";
+
+export const CreateSchema = User.pick({
+    auth0Id: true,
+    email: true,
+});
+
+export interface IUsersRepository {
+    create(data: z.infer<typeof CreateSchema>): Promise<z.infer<typeof User>>;
+
+    fetch(id: string): Promise<z.infer<typeof User> | null>;
+
+    fetchByAuth0Id(auth0Id: string): Promise<z.infer<typeof User> | null>;
+
+    updateEmail(id: string, email: string): Promise<z.infer<typeof User>>;
+
+    updateBillingCustomerId(id: string, billingCustomerId: string): Promise<z.infer<typeof User>>;
+}
\ No newline at end of file
diff --git a/apps/rowboat/src/entities/models/user.ts b/apps/rowboat/src/entities/models/user.ts
new file mode 100644
index 00000000..7d39002a
--- /dev/null
+++ b/apps/rowboat/src/entities/models/user.ts
@@ -0,0 +1,11 @@
+import { z } from "zod";
+
+export const User = z.object({
+    id: z.string(),
+    auth0Id: z.string(),
+    billingCustomerId: z.string().optional(),
+    name: z.string().optional(),
+    email: z.string().optional(),
+    createdAt: z.string().datetime(),
+    updatedAt: z.string().datetime().optional(),
+});
\ No newline at end of file
diff --git a/apps/rowboat/src/infrastructure/mongodb/drop-indexes.ts b/apps/rowboat/src/infrastructure/mongodb/drop-indexes.ts
index 2810cf6d..cd75ed57 100644
--- a/apps/rowboat/src/infrastructure/mongodb/drop-indexes.ts
+++ b/apps/rowboat/src/infrastructure/mongodb/drop-indexes.ts
@@ -9,6 +9,7 @@ import { PROJECT_MEMBERS_COLLECTION } from "../repositories/mongodb.project-memb
 import { RECURRING_JOB_RULES_COLLECTION } from "../repositories/mongodb.recurring-job-rules.indexes";
 import { SCHEDULED_JOB_RULES_COLLECTION } from "../repositories/mongodb.scheduled-job-rules.indexes";
 import { COMPOSIO_TRIGGER_DEPLOYMENTS_COLLECTION } from "../repositories/mongodb.composio-trigger-deployments.indexes";
+import { USERS_COLLECTION } from "../repositories/mongodb.users.indexes";
 
 export async function dropAllIndexes(database: Db): Promise<void> {
     const collections: string[] = [
@@ -22,6 +23,7 @@ export async function dropAllIndexes(database: Db): Promise<void> {
         RECURRING_JOB_RULES_COLLECTION,
         SCHEDULED_JOB_RULES_COLLECTION,
         COMPOSIO_TRIGGER_DEPLOYMENTS_COLLECTION,
+        USERS_COLLECTION,
     ];
 
     for (const collectionName of collections) {
diff --git a/apps/rowboat/src/infrastructure/mongodb/ensure-indexes.ts b/apps/rowboat/src/infrastructure/mongodb/ensure-indexes.ts
index 32d00fc9..d4cdd6b5 100644
--- a/apps/rowboat/src/infrastructure/mongodb/ensure-indexes.ts
+++ b/apps/rowboat/src/infrastructure/mongodb/ensure-indexes.ts
@@ -9,6 +9,7 @@ import { PROJECT_MEMBERS_COLLECTION, PROJECT_MEMBERS_INDEXES } from "../reposito
 import { RECURRING_JOB_RULES_COLLECTION, RECURRING_JOB_RULES_INDEXES } from "../repositories/mongodb.recurring-job-rules.indexes";
 import { SCHEDULED_JOB_RULES_COLLECTION, SCHEDULED_JOB_RULES_INDEXES } from "../repositories/mongodb.scheduled-job-rules.indexes";
 import { COMPOSIO_TRIGGER_DEPLOYMENTS_COLLECTION, COMPOSIO_TRIGGER_DEPLOYMENTS_INDEXES } from "../repositories/mongodb.composio-trigger-deployments.indexes";
+import { USERS_COLLECTION, USERS_INDEXES } from "../repositories/mongodb.users.indexes";
 
 export async function ensureAllIndexes(database: Db): Promise<void> {
     await database.collection(API_KEYS_COLLECTION).createIndexes(API_KEYS_INDEXES);
@@ -21,4 +22,5 @@ export async function ensureAllIndexes(database: Db): Promise<void> {
     await database.collection(RECURRING_JOB_RULES_COLLECTION).createIndexes(RECURRING_JOB_RULES_INDEXES);
     await database.collection(SCHEDULED_JOB_RULES_COLLECTION).createIndexes(SCHEDULED_JOB_RULES_INDEXES);
     await database.collection(COMPOSIO_TRIGGER_DEPLOYMENTS_COLLECTION).createIndexes(COMPOSIO_TRIGGER_DEPLOYMENTS_INDEXES);
+    await database.collection(USERS_COLLECTION).createIndexes(USERS_INDEXES);
 }
\ No newline at end of file
diff --git a/apps/rowboat/src/infrastructure/repositories/mongodb.users.indexes.ts b/apps/rowboat/src/infrastructure/repositories/mongodb.users.indexes.ts
new file mode 100644
index 00000000..4458f7ea
--- /dev/null
+++ b/apps/rowboat/src/infrastructure/repositories/mongodb.users.indexes.ts
@@ -0,0 +1,7 @@
+import { IndexDescription } from "mongodb";
+
+export const USERS_COLLECTION = "users";
+
+export const USERS_INDEXES: IndexDescription[] = [
+    { key: { auth0Id: 1 }, name: "auth0Id_unique", unique: true },
+];
\ No newline at end of file
diff --git a/apps/rowboat/src/infrastructure/repositories/mongodb.users.repository.ts b/apps/rowboat/src/infrastructure/repositories/mongodb.users.repository.ts
new file mode 100644
index 00000000..9d23538f
--- /dev/null
+++ b/apps/rowboat/src/infrastructure/repositories/mongodb.users.repository.ts
@@ -0,0 +1,82 @@
+import { z } from "zod";
+import { db } from "@/app/lib/mongodb";
+import { ObjectId } from "mongodb";
+import { CreateSchema, IUsersRepository } from "@/src/application/repositories/users.repository.interface";
+import { User } from "@/src/entities/models/user";
+
+const DocSchema = User
+    .omit({
+        id: true,
+    });
+
+export class MongoDBUsersRepository implements IUsersRepository {
+    private readonly collection = db.collection<z.infer<typeof DocSchema>>("users");
+
+    async create(data: z.infer<typeof CreateSchema>): Promise<z.infer<typeof User>> {
+        const now = new Date().toISOString();
+        const _id = new ObjectId();
+
+        const doc = {
+            ...data,
+            createdAt: now,
+        };
+
+        await this.collection.insertOne({
+            _id,
+            ...doc,
+        });
+
+        return {
+            ...doc,
+            id: _id.toString(),
+        };
+    }
+
+    async fetch(id: string): Promise<z.infer<typeof User> | null> {
+        const result = await this.collection.findOne({ _id: new ObjectId(id) });
+        if (!result) return null;
+
+        return {
+            ...result,
+            id: result._id.toString(),
+        };
+    }
+
+    async fetchByAuth0Id(auth0Id: string): Promise<z.infer<typeof User> | null> {
+        const result = await this.collection.findOne({ auth0Id });
+        if (!result) return null;
+
+        return {
+            ...result,
+            id: result._id.toString(),
+        };
+    }
+
+    async updateEmail(id: string, email: string): Promise<z.infer<typeof User>> {
+        const result = await this.collection.findOneAndUpdate(
+            { _id: new ObjectId(id) },
+            { $set: { email, updatedAt: new Date().toISOString() } }
+        );
+
+        if (!result) throw new Error("User not found");
+
+        return {
+            ...result,
+            id: result._id.toString(),
+        };
+    }
+
+    async updateBillingCustomerId(id: string, billingCustomerId: string): Promise<z.infer<typeof User>> {
+        const result = await this.collection.findOneAndUpdate(
+            { _id: new ObjectId(id) },
+            { $set: { billingCustomerId, updatedAt: new Date().toISOString() } }
+        );
+
+        if (!result) throw new Error("User not found");
+
+        return {
+            ...result,
+            id: result._id.toString(),
+        };
+    }
+}
\ No newline at end of file

From b49e14fdf89e7973346e95d47dba852271a4666b Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Sat, 23 Aug 2025 09:59:14 +0530
Subject: [PATCH 15/15] update billing types

---
 apps/rowboat/app/actions/billing.actions.ts   | 13 ++++++------
 apps/rowboat/app/billing/app.tsx              |  3 +--
 apps/rowboat/app/billing/callback/page.tsx    |  2 +-
 apps/rowboat/app/billing/page.tsx             |  2 +-
 apps/rowboat/app/lib/billing.ts               | 20 +++++++++----------
 apps/rowboat/app/lib/types/billing_types.ts   | 18 +++++++++++++++--
 .../projects/[projectId]/workflow/page.tsx    |  2 +-
 .../run-conversation-turn.use-case.ts         |  1 +
 .../projects/create-project.use-case.ts       |  2 +-
 9 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/apps/rowboat/app/actions/billing.actions.ts b/apps/rowboat/app/actions/billing.actions.ts
index db2445b3..636287eb 100644
--- a/apps/rowboat/app/actions/billing.actions.ts
+++ b/apps/rowboat/app/actions/billing.actions.ts
@@ -21,9 +21,8 @@ import {
     ModelsResponse
 } from "../lib/types/billing_types";
 import { z } from "zod";
-import { WithStringId } from "../lib/types/types";
 
-export async function getCustomer(): Promise<WithStringId<z.infer<typeof Customer>>> {
+export async function getCustomer(): Promise<z.infer<typeof Customer>> {
     const user = await authCheck();
     if (!user.billingCustomerId) {
         throw new Error("Customer not found");
@@ -41,7 +40,7 @@ export async function authorizeUserAction(request: z.infer<typeof AuthorizeReque
     }
 
     const customer = await getCustomer();
-    const response = await authorize(customer._id, request);
+    const response = await authorize(customer.id, request);
     return response;
 }
 
@@ -51,7 +50,7 @@ export async function logUsage(request: z.infer<typeof LogUsageRequest>) {
     }
 
     const customer = await getCustomer();
-    await libLogUsage(customer._id, request);
+    await libLogUsage(customer.id, request);
     return;
 }
 
@@ -61,7 +60,7 @@ export async function getCustomerPortalUrl(returnUrl: string): Promise<string> {
     }
 
     const customer = await getCustomer();
-    return await createCustomerPortalSession(customer._id, returnUrl);
+    return await createCustomerPortalSession(customer.id, returnUrl);
 }
 
 export async function getPrices(): Promise<z.infer<typeof PricesResponse>> {
@@ -80,7 +79,7 @@ export async function updateSubscriptionPlan(plan: z.infer<typeof SubscriptionPl
 
     const customer = await getCustomer();
     const request: z.infer<typeof UpdateSubscriptionPlanRequest> = { plan, returnUrl };
-    const url = await libUpdateSubscriptionPlan(customer._id, request);
+    const url = await libUpdateSubscriptionPlan(customer.id, request);
     return url;
 }
 
@@ -90,6 +89,6 @@ export async function getEligibleModels(): Promise<z.infer<typeof ModelsResponse
     }
 
     const customer = await getCustomer();
-    const response = await libGetEligibleModels(customer._id);
+    const response = await libGetEligibleModels(customer.id);
     return response;
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/billing/app.tsx b/apps/rowboat/app/billing/app.tsx
index 02da8665..8e7524be 100644
--- a/apps/rowboat/app/billing/app.tsx
+++ b/apps/rowboat/app/billing/app.tsx
@@ -8,7 +8,6 @@ import { z } from "zod";
 import { tokens } from "@/app/styles/design-tokens";
 import { SectionHeading } from "@/components/ui/section-heading";
 import { HorizontalDivider } from "@/components/ui/horizontal-divider";
-import { WithStringId } from "@/app/lib/types/types";
 import clsx from 'clsx';
 import { getCustomerPortalUrl } from "../actions/billing.actions";
 import { useState } from "react";
@@ -31,7 +30,7 @@ const planDetails = {
 };
 
 interface BillingPageProps {
-    customer: WithStringId<z.infer<typeof Customer>>;
+    customer: z.infer<typeof Customer>;
     usage: z.infer<typeof UsageResponse>;
 }
 
diff --git a/apps/rowboat/app/billing/callback/page.tsx b/apps/rowboat/app/billing/callback/page.tsx
index eae1fa02..c74bd14f 100644
--- a/apps/rowboat/app/billing/callback/page.tsx
+++ b/apps/rowboat/app/billing/callback/page.tsx
@@ -13,7 +13,7 @@ export default async function Page(
 ) {
     const searchParams = await props.searchParams;
     const customer = await requireBillingCustomer();
-    await syncWithStripe(customer._id);
+    await syncWithStripe(customer.id);
     const redirectUrl = searchParams.redirect as string;
     redirect(redirectUrl || '/projects');
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/billing/page.tsx b/apps/rowboat/app/billing/page.tsx
index 974c73f9..2ff9141c 100644
--- a/apps/rowboat/app/billing/page.tsx
+++ b/apps/rowboat/app/billing/page.tsx
@@ -12,6 +12,6 @@ export default async function Page() {
     }
 
     const customer = await requireBillingCustomer();
-    const usage = await getUsage(customer._id);
+    const usage = await getUsage(customer.id);
     return <BillingPage customer={customer} usage={usage} />;
 }
\ No newline at end of file
diff --git a/apps/rowboat/app/lib/billing.ts b/apps/rowboat/app/lib/billing.ts
index 7a0c00ee..ff586a47 100644
--- a/apps/rowboat/app/lib/billing.ts
+++ b/apps/rowboat/app/lib/billing.ts
@@ -1,4 +1,3 @@
-import { WithStringId } from './types/types';
 import { z } from 'zod';
 import { Customer, AuthorizeRequest, AuthorizeResponse, LogUsageRequest, UsageResponse, CustomerPortalSessionResponse, PricesResponse, UpdateSubscriptionPlanRequest, UpdateSubscriptionPlanResponse, ModelsResponse, UsageItem } from './types/billing_types';
 import { redirect } from 'next/navigation';
@@ -14,7 +13,7 @@ const BILLING_API_KEY = process.env.BILLING_API_KEY || 'test';
 let logCounter = 1;
 
 const GUEST_BILLING_CUSTOMER = {
-    _id: "guest-user",
+    id: "guest-user",
     userId: "guest-user",
     name: "Guest",
     email: "guest@rowboatlabs.com",
@@ -23,7 +22,6 @@ const GUEST_BILLING_CUSTOMER = {
     subscriptionPlan: "free" as const,
     subscriptionStatus: "active" as const,
     createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
 };
 
 
@@ -41,7 +39,7 @@ export class UsageTracker{
     }
 }
 
-export async function getCustomerForUserId(userId: string): Promise<WithStringId<z.infer<typeof Customer>> | null> {
+export async function getCustomerForUserId(userId: string): Promise<z.infer<typeof Customer> | null> {
     const usersRepository = container.resolve<IUsersRepository>("usersRepository");
 
     const user = await usersRepository.fetch(userId);
@@ -64,10 +62,10 @@ export async function getCustomerIdForProject(projectId: string): Promise<string
     if (!customer) {
         throw new Error("User has no billing customer id");
     }
-    return customer._id;
+    return customer.id;
 }
 
-export async function getBillingCustomer(id: string): Promise<WithStringId<z.infer<typeof Customer>> | null> {
+export async function getBillingCustomer(id: string): Promise<z.infer<typeof Customer> | null> {
     const response = await fetch(`${BILLING_API_URL}/api/customers/${id}`, {
         method: 'GET',
         headers: {
@@ -86,7 +84,7 @@ export async function getBillingCustomer(id: string): Promise<WithStringId<z.inf
     return parseResult.data;
 }
 
-async function createBillingCustomer(userId: string, email: string): Promise<WithStringId<z.infer<typeof Customer>>> {
+async function createBillingCustomer(userId: string, email: string): Promise<z.infer<typeof Customer>> {
     const response = await fetch(`${BILLING_API_URL}/api/customers`, {
         method: 'POST',
         headers: {
@@ -266,7 +264,7 @@ export async function getEligibleModels(customerId: string): Promise<z.infer<typ
  * const billingCustomer = await requireBillingCustomer();
  * ```
  */
-export async function requireBillingCustomer(): Promise<WithStringId<z.infer<typeof Customer>>> {
+export async function requireBillingCustomer(): Promise<z.infer<typeof Customer>> {
     const user = await requireAuth();
     const usersRepository = container.resolve<IUsersRepository>("usersRepository");
 
@@ -283,7 +281,7 @@ export async function requireBillingCustomer(): Promise<WithStringId<z.infer<typ
     }
 
     // fetch or create customer
-    let customer: WithStringId<z.infer<typeof Customer>> | null;
+    let customer: z.infer<typeof Customer> | null;
     if (user.billingCustomerId) {
         customer = await getBillingCustomer(user.billingCustomerId);
     } else {
@@ -291,7 +289,7 @@ export async function requireBillingCustomer(): Promise<WithStringId<z.infer<typ
         console.log("created billing customer", JSON.stringify({ userId: user.id, customer }));
 
         // update customer id in db
-        await usersRepository.updateBillingCustomerId(user.id, customer._id);
+        await usersRepository.updateBillingCustomerId(user.id, customer.id);
     }
     if (!customer) {
         throw new Error("Failed to fetch or create billing customer");
@@ -312,7 +310,7 @@ export async function requireBillingCustomer(): Promise<WithStringId<z.infer<typ
  * const billingCustomer = await requireActiveBillingSubscription();
  * ```
  */
-export async function requireActiveBillingSubscription(): Promise<WithStringId<z.infer<typeof Customer>>> {
+export async function requireActiveBillingSubscription(): Promise<z.infer<typeof Customer>> {
     const billingCustomer = await requireBillingCustomer();
 
     if (USE_BILLING && billingCustomer.subscriptionStatus !== "active" && billingCustomer.subscriptionStatus !== "past_due") {
diff --git a/apps/rowboat/app/lib/types/billing_types.ts b/apps/rowboat/app/lib/types/billing_types.ts
index adb13a8b..0ac385d6 100644
--- a/apps/rowboat/app/lib/types/billing_types.ts
+++ b/apps/rowboat/app/lib/types/billing_types.ts
@@ -1,3 +1,17 @@
+/**
+ * 🚨 ATTENTION: DO NOT MODIFY THIS FILE! 🚨
+ * 
+ * This file contains billing types that are manually copied
+ * from the billing service repository. Any manual changes will be
+ * overwritten during the next sync.
+ * 
+ * If you need to modify billing types:
+ * 1. Make changes in the billing service repo
+ * 2. Copy the updated file from there
+ * 3. Never edit this file directly
+ * 
+ * This file is a manual copy - keep it in sync with the source!
+ */
 import { z } from "zod";
 
 export const SubscriptionPlan = z.enum(["free", "starter", "pro"]);
@@ -57,7 +71,7 @@ export const LogUsageRequest = z.object({
 export const CustomerUsageData = z.record(z.string(), z.number());
 
 export const Customer = z.object({
-    _id: z.string(),
+    id: z.string(),
     userId: z.string(),
     email: z.string(),
     stripeCustomerId: z.string(),
@@ -65,7 +79,7 @@ export const Customer = z.object({
     subscriptionPlan: SubscriptionPlan.optional(),
     subscriptionStatus: z.enum([ 'active', 'past_due' ]).optional(),
     createdAt: z.string().datetime(),
-    updatedAt: z.string().datetime(),
+    updatedAt: z.string().datetime().optional(),
     subscriptionPlanUpdatedAt: z.string().datetime().optional(),
     usage: CustomerUsageData.optional(),
     usageUpdatedAt: z.string().datetime().optional(),
diff --git a/apps/rowboat/app/projects/[projectId]/workflow/page.tsx b/apps/rowboat/app/projects/[projectId]/workflow/page.tsx
index 008f4317..864d31c4 100644
--- a/apps/rowboat/app/projects/[projectId]/workflow/page.tsx
+++ b/apps/rowboat/app/projects/[projectId]/workflow/page.tsx
@@ -47,7 +47,7 @@ export default async function Page(
 
     let eligibleModels: z.infer<typeof ModelsResponse> | "*" = '*';
     if (USE_BILLING) {
-        eligibleModels = await getEligibleModels(customer._id);
+        eligibleModels = await getEligibleModels(customer.id);
     }
 
     console.log('/workflow page.tsx serve');
diff --git a/apps/rowboat/src/application/use-cases/conversations/run-conversation-turn.use-case.ts b/apps/rowboat/src/application/use-cases/conversations/run-conversation-turn.use-case.ts
index 635a960d..eb3c70e8 100644
--- a/apps/rowboat/src/application/use-cases/conversations/run-conversation-turn.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/conversations/run-conversation-turn.use-case.ts
@@ -165,6 +165,7 @@ export class RunConversationTurnUseCase implements IRunConversationTurnUseCase {
             }
         } finally {
             // Log billing usage
+            console.log('finally logging billing usage');
             if (USE_BILLING && billingCustomerId) {
                 await logUsage(billingCustomerId, {
                     items: usageTracker.flush(),
diff --git a/apps/rowboat/src/application/use-cases/projects/create-project.use-case.ts b/apps/rowboat/src/application/use-cases/projects/create-project.use-case.ts
index c439c788..8a5d4e10 100644
--- a/apps/rowboat/src/application/use-cases/projects/create-project.use-case.ts
+++ b/apps/rowboat/src/application/use-cases/projects/create-project.use-case.ts
@@ -65,7 +65,7 @@ export class CreateProjectUseCase implements ICreateProjectUseCase {
             }
 
             // validate enough credits
-            const result = await authorize(customer._id, {
+            const result = await authorize(customer.id, {
                 type: "create_project",
                 data: {
                     existingProjectCount: count,