Merge remote-tracking branch 'origin/staging' into chore/bump-polymarket-trader-v0.40.0-rc6

Author: Tanya-atatakai

frontend/config/agents.ts

@@ -107,7 +107,7 @@ export const AGENT_CONFIG: {
     evmHomeChainId: EvmChainIdMap.Gnosis,
     middlewareHomeChainId: MiddlewareChainMap.GNOSIS,
     agentIds: [14, 25],
-    defaultStakingProgramId: STAKING_PROGRAM_IDS.PearlBetaMechMarketplace3,
+    defaultStakingProgramId: STAKING_PROGRAM_IDS.OmenstratIII,
     serviceApi: PredictTraderService,
     displayName: 'Omenstrat',
     description: 'Participates in prediction markets.',
@@ -132,7 +132,7 @@ export const AGENT_CONFIG: {
         [TokenSymbolMap.pUSD]: getPolystratPusdConfig(),
       },
     },
-    defaultStakingProgramId: STAKING_PROGRAM_IDS.PolygonBeta1,
+    defaultStakingProgramId: STAKING_PROGRAM_IDS.PolystratI,
     serviceApi: Polystrat,
     displayName: 'Polystrat',
     description: 'Participates in prediction markets on Polymarket.',
@@ -161,7 +161,7 @@ export const AGENT_CONFIG: {
         [TokenSymbolMap.USDC]: getOptimusUsdcConfig(),
       },
     },
-    defaultStakingProgramId: STAKING_PROGRAM_IDS.OptimusAlpha2,
+    defaultStakingProgramId: STAKING_PROGRAM_IDS.OptimusI,
     serviceApi: OptimismService,
     displayName: 'Optimus',
     description:
@@ -256,7 +256,6 @@ export const AGENT_CONFIG: {
   [AgentMap.PettAi]: {
     isAgentEnabled: true,
     isAddingNewBlocked: true,
-    shutdownDate: 'June 15, 2026',
     requiresSetup: false,
     isX402Enabled: X402_ENABLED_FLAGS[AgentMap.PettAi],
     name: 'Pett.ai',

frontend/package.json

@@ -5,6 +5,7 @@
     "@tootallnate/once": "3.0.1",
     "bn.js": "5.2.3",
     "csstype": "3.1.3",
+    "dayjs": "1.11.13",
     "diff": "5.2.2",
     "flatted": "3.4.2",
     "form-data": "4.0.6",

frontend/tests/components/SetupPage/AgentOnboarding/FundingRequirementStep.test.tsx

@@ -48,8 +48,8 @@ describe('FundingRequirementStep — maintenance alert copy', () => {
   });
 
   it('keeps the "existing agents continue to run" line for a blocked-but-not-phased-out agent', () => {
-    // PettAi blocks new instances (isAddingNewBlocked) but is sunsetting via
-    // shutdownDate, not phased out — so existing instances still run.
+    // PettAi blocks new instances (isAddingNewBlocked) but is not phased out —
+    // so existing instances still run.
     render(<FundingRequirementStep agentType={AgentMap.PettAi} />);
 
     expect(

frontend/tests/config/agents.test.ts

@@ -109,8 +109,8 @@ describe('PettAi creation blocking and deprecation', () => {
     expect(AGENT_CONFIG[AgentMap.PettAi].isAddingNewBlocked).toBe(true);
   });
 
-  it('has shutdownDate set to June 15, 2026', () => {
-    expect(AGENT_CONFIG[AgentMap.PettAi].shutdownDate).toBe('June 15, 2026');
+  it('has no shutdownDate (deprecation banner removed)', () => {
+    expect(AGENT_CONFIG[AgentMap.PettAi].shutdownDate).toBeUndefined();
   });
 
   it('PettAi still appears in ACTIVE_AGENTS', () => {