inkeep · dimaMachina · Dec 19, 2025 · Dec 19, 2025
diff --git a/agents-run-api/src/__tests__/agents/Agent.test.ts b/agents-run-api/src/__tests__/agents/Agent.test.ts
@@ -409,6 +409,7 @@ describe('Agent Integration with SystemPromptBuilder', () => {
           usageGuidelines: 'Use this tool when appropriate for the task at hand.',
         },
       ],
+      policies: [],
       dataComponents: [],
       artifacts: [],
       artifactComponents: [],
@@ -431,6 +432,7 @@ describe('Agent Integration with SystemPromptBuilder', () => {
     expect(systemPromptBuilder.buildSystemPrompt).toHaveBeenCalledWith({
       corePrompt: `You are a helpful test agent that can search databases and assist users.`,
       prompt: undefined,
+      policies: [],
       tools: [],
       dataComponents: [],
       artifacts: [],
@@ -454,6 +456,7 @@ describe('Agent Integration with SystemPromptBuilder', () => {
     expect(systemPromptBuilder.buildSystemPrompt).toHaveBeenCalledWith({
       corePrompt: `You are a helpful test agent that can search databases and assist users.`,
       prompt: undefined,
+      policies: [],
       tools: [],
       dataComponents: [],
       artifacts: [],
@@ -489,6 +492,7 @@ describe('Agent Integration with SystemPromptBuilder', () => {
       corePrompt: `You are a helpful test agent that can search databases and assist users.`,
       prompt: undefined,
       tools: [], // Empty tools array since availableTools is undefined
+      policies: [],
       dataComponents: [],
       artifacts: [],
       artifactComponents: [],

diff --git a/agents-run-api/src/__tests__/agents/SystemPromptBuilder.test.ts b/agents-run-api/src/__tests__/agents/SystemPromptBuilder.test.ts
@@ -164,6 +164,28 @@ describe('SystemPromptBuilder', () => {
       expect(result).toContain('Second tool');
     });
 
+    test('should include policies section in order when provided', () => {
+      const config: SystemPromptV1 = {
+        corePrompt: 'You are a policy-aware assistant.',
+        tools: [],
+        dataComponents: [],
+        artifacts: [],
+        isThinkingPreparation: false,
+        policies: [
+          { name: 'Second Policy', content: 'Second content', index: 2 },
+          { name: 'First Policy', content: 'First content', index: 1 },
+        ],
+      };
+
+      const result = builder.buildSystemPrompt(config);
+      expect(result).toContain('<policies>');
+      expect(result).toContain('First Policy');
+      expect(result).toContain('Second Policy');
+      expect(result).toContain('First content');
+      expect(result).toContain('Second content');
+      expect(result.indexOf('First Policy')).toBeLessThan(result.indexOf('Second Policy'));
+    });
+
     test('should handle tools with complex parameter schemas', () => {
       const mockTool = createMockMcpTool('complex-server', [
         {

diff --git a/agents-run-api/src/agents/Agent.ts b/agents-run-api/src/agents/Agent.ts
@@ -29,6 +29,7 @@ import {
   ModelFactory,
   type ModelSettings,
   type Models,
+  type SubAgentPolicyWithIndex,
   parseEmbeddedJson,
   type SubAgentStopWhen,
   TemplateEngine,
@@ -133,6 +134,7 @@ export type AgentConfig = {
   }>;
   contextConfigId?: string;
   dataComponents?: DataComponentApiInsert[];
+  policies?: SubAgentPolicyWithIndex[];
   artifactComponents?: ArtifactComponentApiInsert[];
   conversationHistoryConfig?: AgentConversationHistoryConfig;
   models?: Models;
@@ -1695,6 +1697,7 @@ export class Agent {
     const config: SystemPromptV1 = {
       corePrompt: processedPrompt,
       prompt,
+      policies: this.config.policies || [],
       tools: toolDefinitions,
       dataComponents: componentDataComponents,
       artifacts: referenceArtifacts,

diff --git a/agents-run-api/src/agents/generateTaskHandler.ts b/agents-run-api/src/agents/generateTaskHandler.ts
@@ -8,6 +8,7 @@ import {
   getArtifactComponentsForAgent,
   getDataComponentsForAgent,
   getExternalAgentsForSubAgent,
+  getPoliciesForSubAgents,
   getRelatedAgentsForAgent,
   getSubAgentById,
   getTeamAgentsForSubAgent,
@@ -77,6 +78,7 @@ export const createTaskHandler = (
         toolsForAgent,
         dataComponents,
         artifactComponents,
+        policiesForSubAgents,
       ] = await Promise.all([
         getRelatedAgentsForAgent(dbClient)({
           scopes: {
@@ -126,6 +128,14 @@ export const createTaskHandler = (
             subAgentId: config.subAgentId,
           },
         }),
+        getPoliciesForSubAgents(dbClient)({
+          scopes: {
+            tenantId: config.tenantId,
+            projectId: config.projectId,
+            agentId: config.agentId,
+          },
+          subAgentIds: [config.subAgentId],
+        }),
       ]);
 
       const enhancedInternalRelations = await Promise.all(
@@ -282,6 +292,11 @@ export const createTaskHandler = (
           })
         )) ?? [];
 
+      const policies =
+        policiesForSubAgents
+          ?.filter((policy) => policy.subAgentId === config.subAgentId)
+          .sort((a, b) => (a.index ?? 0) - (b.index ?? 0)) || [];
+
       const agent = new Agent(
         {
           id: config.subAgentId,
@@ -296,6 +311,7 @@ export const createTaskHandler = (
           prompt,
           models: models || undefined,
           stopWhen: stopWhen || undefined,
+          policies,
           subAgentRelations: enhancedInternalRelations.map((relation) => ({
             id: relation.id,
             tenantId: config.tenantId,

diff --git a/agents-run-api/src/agents/types.ts b/agents-run-api/src/agents/types.ts
@@ -10,9 +10,20 @@ export interface VersionConfig<TConfig> {
   assemble(templates: Map<string, string>, config: TConfig): string;
 }
 
+export interface PolicyData {
+  id?: string;
+  subAgentPolicyId?: string;
+  name: string;
+  description?: string | null;
+  content: string;
+  metadata?: Record<string, unknown> | null;
+  index?: number;
+}
+
 export interface SystemPromptV1 {
   corePrompt: string; // Just the agent's prompt string
   prompt?: string; // Agent-level context and instructions
+  policies?: PolicyData[];
   artifacts: Artifact[];
   tools: ToolData[]; // Support both formats
   dataComponents: DataComponentApiInsert[];

diff --git a/agents-run-api/src/agents/versions/v1/Phase1Config.ts b/agents-run-api/src/agents/versions/v1/Phase1Config.ts
@@ -7,7 +7,7 @@ import artifactTemplate from '../../../../templates/v1/shared/artifact.xml?raw';
 import artifactRetrievalGuidance from '../../../../templates/v1/shared/artifact-retrieval-guidance.xml?raw';
 
 import { getLogger } from '../../../logger';
-import type { SystemPromptV1, ToolData, VersionConfig } from '../../types';
+import type { PolicyData, SystemPromptV1, ToolData, VersionConfig } from '../../types';
 
 const _logger = getLogger('Phase1Config');
 
@@ -88,6 +88,9 @@ export class Phase1Config implements VersionConfig<SystemPromptV1> {
     const agentContextSection = this.generateAgentContextSection(config.prompt);
     systemPrompt = systemPrompt.replace('{{AGENT_CONTEXT_SECTION}}', agentContextSection);
 
+    const policiesSection = this.generatePoliciesSection(config.policies);
+    systemPrompt = systemPrompt.replace('{{POLICIES_SECTION}}', policiesSection);
+
     const rawToolData = this.isToolDataArray(config.tools)
       ? config.tools
       : Phase1Config.convertMcpToolsToToolData(config.tools as McpTool[]);
@@ -158,6 +161,35 @@ export class Phase1Config implements VersionConfig<SystemPromptV1> {
     return thinkingPreparationTemplate;
   }
 
+  private generatePoliciesSection(policies?: PolicyData[]): string {
+    if (!policies || policies.length === 0) {
+      return '';
+    }
+
+    const sortedPolicies = [...policies].sort(
+      (a, b) => (a.index ?? 0) - (b.index ?? 0)
+    );
+
+    const policyEntries = sortedPolicies
+      .map((policy) => {
+        const description = policy.description ? `<description>${policy.description}</description>` : '';
+        return `
+  <policy>
+    <name>${policy.name}</name>
+    ${description}
+    <content>
+      ${policy.content}
+    </content>
+  </policy>`;
+      })
+      .join('\n');
+
+    return `
+  <policies>
+    ${policyEntries}
+  </policies>`;
+  }
+
   private generateTransferInstructions(hasTransferRelations?: boolean): string {
     if (!hasTransferRelations) {
       return '';

diff --git a/agents-run-api/templates/v1/phase1/system-prompt.xml b/agents-run-api/templates/v1/phase1/system-prompt.xml
@@ -10,6 +10,8 @@
 
   {{AGENT_CONTEXT_SECTION}}
 
+  {{POLICIES_SECTION}}
+
   {{ARTIFACTS_SECTION}}
   {{TOOLS_SECTION}}
 
@@ -57,4 +59,4 @@
     - Cite tool results when applicable
     - Maintain conversational flow while being informative
   </response_format>
-</system_message> 
+</system_message>