From 83b5f2a5951b745cda10578235de20fb794118cd Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Sat, 24 Jan 2026 06:18:21 +0000
Subject: [PATCH 01/11] fix: pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-CHQOSLOGBACK-15062482
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9c5992b..c193297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>1.5.18</version>
+            <version>1.5.25</version>
         </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.18</version>
+            <version>1.5.25</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

From 0ff4eb927b4ecf59b991557ee24d0ee20e1147c2 Mon Sep 17 00:00:00 2001
From: Arjun Danda Sureshbabu <a.sureshbabu@snowflake.com>
Date: Wed, 4 Feb 2026 12:02:26 -0800
Subject: [PATCH 02/11] Adding support for Search, Agent and Semantic View
 support

---
 .../MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql    |  40 +++++
 .../CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql |  12 ++
 .../SEMANTIC_VIEWS/SALES_ANALYTICS.sql        |  33 ++++
 .../dlsync/models/ScriptObjectType.java       |   3 +
 .../dependency/DependencyExtractorTest.java   | 167 ++++++++++++++++++
 .../snowflake/dlsync/doa/ScriptRepoTest.java  |  91 ++++++++++
 .../dlsync/parser/SqlTokenizerTest.java       | 112 ++++++++++++
 7 files changed, 458 insertions(+)
 create mode 100644 example_scripts/main/example_db/MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql
 create mode 100644 example_scripts/main/example_db/MAIN_SCHEMA/CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql
 create mode 100644 example_scripts/main/example_db/MAIN_SCHEMA/SEMANTIC_VIEWS/SALES_ANALYTICS.sql

diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql b/example_scripts/main/example_db/MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql
new file mode 100644
index 0000000..0153c9c
--- /dev/null
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql
@@ -0,0 +1,40 @@
+CREATE OR REPLACE AGENT ${EXAMPLE_DB}.${MAIN_SCHEMA}.SALES_ASSISTANT
+  COMMENT = 'Sales assistant agent for product and order queries'
+  PROFILE = '{"display_name": "Sales Assistant", "avatar": "sales-icon.png", "color": "blue"}'
+  FROM SPECIFICATION
+  $$
+  models:
+    orchestration: claude-4-sonnet
+
+  orchestration:
+    budget:
+      seconds: 30
+      tokens: 16000
+
+  instructions:
+    response: "You will respond in a friendly but professional manner about sales and products"
+    orchestration: "For product questions use Search; for sales analytics use Analyst"
+    system: "You are a helpful sales assistant that helps with product and order inquiries"
+    sample_questions:
+      - question: "What products do we have in stock?"
+        answer: "I'll search our product catalog to find available items."
+      - question: "What were our top selling products last month?"
+        answer: "I'll analyze our sales data to find the best performers."
+
+  tools:
+    - tool_spec:
+        type: "cortex_analyst_text_to_sql"
+        name: "SalesAnalyst"
+        description: "Analyzes sales data and generates reports"
+    - tool_spec:
+        type: "cortex_search"
+        name: "ProductSearch"
+        description: "Searches product catalog and documentation"
+
+  tool_resources:
+    SalesAnalyst:
+      semantic_view: "${EXAMPLE_DB}.${MAIN_SCHEMA}.SALES_ANALYTICS"
+    ProductSearch:
+      name: "${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCT_SEARCH"
+      max_results: "10"
+  $$;
diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql b/example_scripts/main/example_db/MAIN_SCHEMA/CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql
new file mode 100644
index 0000000..a24f018
--- /dev/null
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql
@@ -0,0 +1,12 @@
+CREATE OR REPLACE CORTEX SEARCH SERVICE ${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCT_SEARCH
+  ON product_description
+  ATTRIBUTES product_name, category
+  WAREHOUSE = ${MY_WAREHOUSE}
+  TARGET_LAG = '1 hour'
+AS (
+  SELECT
+    product_name,
+    product_description,
+    category
+  FROM ${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCTS
+);
diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/SEMANTIC_VIEWS/SALES_ANALYTICS.sql b/example_scripts/main/example_db/MAIN_SCHEMA/SEMANTIC_VIEWS/SALES_ANALYTICS.sql
new file mode 100644
index 0000000..02807ba
--- /dev/null
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/SEMANTIC_VIEWS/SALES_ANALYTICS.sql
@@ -0,0 +1,33 @@
+CREATE OR REPLACE SEMANTIC VIEW ${EXAMPLE_DB}.${MAIN_SCHEMA}.SALES_ANALYTICS
+  TABLES (
+    products AS ${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCTS
+      PRIMARY KEY (PRODUCT_ID)
+      COMMENT = 'Product catalog table',
+    orders AS ${EXAMPLE_DB}.${MAIN_SCHEMA}.ORDERS
+      PRIMARY KEY (ORDER_ID)
+      COMMENT = 'Customer orders table'
+  )
+  RELATIONSHIPS (
+    orders (PRODUCT_ID) REFERENCES products
+  )
+  DIMENSIONS (
+    products.product_name AS products.NAME
+      WITH SYNONYMS = ('product', 'item')
+      COMMENT = 'Name of the product',
+    products.category AS products.CATEGORY
+      WITH SYNONYMS = ('type', 'group')
+      COMMENT = 'Product category',
+    orders.order_date AS orders.ORDER_DATE
+      WITH SYNONYMS = ('date', 'purchase date')
+      COMMENT = 'Date when order was placed'
+  )
+  METRICS (
+    orders.total_revenue AS SUM(orders.PRICE * orders.QUANTITY)
+      WITH SYNONYMS = ('revenue', 'sales')
+      COMMENT = 'Total revenue from orders',
+    orders.order_count AS COUNT(orders.ORDER_ID)
+      WITH SYNONYMS = ('number of orders', 'count')
+      COMMENT = 'Total number of orders'
+  )
+  COMMENT = 'Semantic view for sales analytics'
+  AI_SQL_GENERATION 'When asked about sales, use total_revenue metric. When asked about orders, use order_count metric.';
diff --git a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
index 1673c8b..375c04d 100644
--- a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
+++ b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
@@ -8,6 +8,9 @@ public enum ScriptObjectType {
     STREAMLITS("STREAMLIT", ObjectLevel.SCHEMA, false),
     PIPES("PIPE", ObjectLevel.SCHEMA, false),
     MASKING_POLICIES("MASKING POLICY", ObjectLevel.SCHEMA, false),
+    CORTEX_SEARCH_SERVICES("CORTEX SEARCH SERVICE", ObjectLevel.SCHEMA, false),
+    SEMANTIC_VIEWS("SEMANTIC VIEW", ObjectLevel.SCHEMA, false),
+    AGENTS("AGENT", ObjectLevel.SCHEMA, false),
     NETWORK_RULES("NETWORK RULE", ObjectLevel.SCHEMA, false),
     RESOURCE_MONITORS("RESOURCE MONITOR", ObjectLevel.ACCOUNT, false),
     NETWORK_POLICIES("NETWORK POLICY", ObjectLevel.ACCOUNT, false),
diff --git a/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java b/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
index b986dce..32314c2 100644
--- a/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
+++ b/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
@@ -388,5 +388,172 @@ void extractScriptDependenciesIdentifierInQuotes() {
 
     }
 
+    SchemaScript mockCortexSearchDependency(String name, String schema) {
+        String content = "CREATE OR REPLACE CORTEX SEARCH SERVICE " + name + "\n" +
+                "  ON search_column\n" +
+                "  ATTRIBUTES attr1, attr2\n" +
+                "  WAREHOUSE = MY_WH\n" +
+                "  TARGET_LAG = '1 hour'\n" +
+                "AS (SELECT * FROM SOURCE_TABLE);";
+        return ScriptFactory.getSchemaScript("TEST_DB", schema, ScriptObjectType.CORTEX_SEARCH_SERVICES, name, content);
+    }
+
+    @Test
+    void extractScriptDependenciesCortexSearchService() {
+        String content = "CREATE OR REPLACE CORTEX SEARCH SERVICE TEST_SCHEMA.PRODUCT_SEARCH\n" +
+                "  ON product_description\n" +
+                "  ATTRIBUTES product_name, category\n" +
+                "  WAREHOUSE = MY_WH\n" +
+                "  TARGET_LAG = '1 hour'\n" +
+                "AS (\n" +
+                "  SELECT product_name, product_description, category\n" +
+                "  FROM TEST_SCHEMA.PRODUCTS\n" +
+                ");";
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.CORTEX_SEARCH_SERVICES, "PRODUCT_SEARCH", content);
+        MigrationScript dependency1 = mockTableDependency("PRODUCTS", "TEST_SCHEMA");
+        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());
+        changedScript.add(script);
+        changedScript.add(dependency1);
+        dependencyExtractor.addScripts(changedScript);
+        Set<Script> expected = Set.of(
+                dependency1
+        );
+        Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
+        assertEquals(expected, actual, "Cortex Search Service dependency extractor failed:");
+    }
+
+    @Test
+    void extractScriptDependenciesCortexSearchServiceWithMultipleTables() {
+        String content = "CREATE OR REPLACE CORTEX SEARCH SERVICE TEST_SCHEMA.UNIFIED_SEARCH\n" +
+                "  ON content\n" +
+                "  ATTRIBUTES title, category\n" +
+                "  WAREHOUSE = MY_WH\n" +
+                "  TARGET_LAG = '1 hour'\n" +
+                "AS (\n" +
+                "  SELECT title, content, category FROM TEST_SCHEMA.ARTICLES\n" +
+                "  UNION ALL\n" +
+                "  SELECT name AS title, description AS content, type AS category FROM TEST_SCHEMA.PRODUCTS\n" +
+                ");";
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.CORTEX_SEARCH_SERVICES, "UNIFIED_SEARCH", content);
+        MigrationScript dependency1 = mockTableDependency("ARTICLES", "TEST_SCHEMA");
+        MigrationScript dependency2 = mockTableDependency("PRODUCTS", "TEST_SCHEMA");
+        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());
+        changedScript.add(script);
+        changedScript.add(dependency1);
+        changedScript.add(dependency2);
+        dependencyExtractor.addScripts(changedScript);
+        Set<Script> expected = Set.of(
+                dependency1,
+                dependency2
+        );
+        Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
+        assertEquals(expected, actual, "Cortex Search Service with multiple tables dependency extractor failed:");
+    }
+
+    @Test
+    void testCortexSearchServiceObjectType() {
+        assertEquals("CORTEX SEARCH SERVICE", ScriptObjectType.CORTEX_SEARCH_SERVICES.getSingular());
+        assertEquals("CORTEX_SEARCH_SERVICE", ScriptObjectType.CORTEX_SEARCH_SERVICES.getEscapedSingular());
+        assertEquals(ScriptObjectType.ObjectLevel.SCHEMA, ScriptObjectType.CORTEX_SEARCH_SERVICES.getLevel());
+        assertFalse(ScriptObjectType.CORTEX_SEARCH_SERVICES.isMigration());
+    }
+
+    SchemaScript mockSemanticViewDependency(String name, String schema) {
+        String content = "CREATE OR REPLACE SEMANTIC VIEW " + name + "\n" +
+                "  TABLES (t AS SOURCE_TABLE PRIMARY KEY (ID))\n" +
+                "  DIMENSIONS (t.dim1 AS t.COL1)\n" +
+                "  METRICS (t.metric1 AS SUM(t.COL2));";
+        return ScriptFactory.getSchemaScript("TEST_DB", schema, ScriptObjectType.SEMANTIC_VIEWS, name, content);
+    }
+
+    @Test
+    void extractScriptDependenciesSemanticView() {
+        String content = "CREATE OR REPLACE SEMANTIC VIEW TEST_SCHEMA.SALES_ANALYTICS\n" +
+                "  TABLES (\n" +
+                "    products AS TEST_SCHEMA.PRODUCTS PRIMARY KEY (PRODUCT_ID),\n" +
+                "    orders AS TEST_SCHEMA.ORDERS PRIMARY KEY (ORDER_ID)\n" +
+                "  )\n" +
+                "  RELATIONSHIPS (orders (PRODUCT_ID) REFERENCES products)\n" +
+                "  DIMENSIONS (products.name AS products.NAME)\n" +
+                "  METRICS (orders.revenue AS SUM(orders.PRICE));";
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.SEMANTIC_VIEWS, "SALES_ANALYTICS", content);
+        MigrationScript dependency1 = mockTableDependency("PRODUCTS", "TEST_SCHEMA");
+        MigrationScript dependency2 = mockTableDependency("ORDERS", "TEST_SCHEMA");
+        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());
+        changedScript.add(script);
+        changedScript.add(dependency1);
+        changedScript.add(dependency2);
+        dependencyExtractor.addScripts(changedScript);
+        Set<Script> expected = Set.of(
+                dependency1,
+                dependency2
+        );
+        Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
+        assertEquals(expected, actual, "Semantic View dependency extractor failed:");
+    }
+
+    @Test
+    void testSemanticViewObjectType() {
+        assertEquals("SEMANTIC VIEW", ScriptObjectType.SEMANTIC_VIEWS.getSingular());
+        assertEquals("SEMANTIC_VIEW", ScriptObjectType.SEMANTIC_VIEWS.getEscapedSingular());
+        assertEquals(ScriptObjectType.ObjectLevel.SCHEMA, ScriptObjectType.SEMANTIC_VIEWS.getLevel());
+        assertFalse(ScriptObjectType.SEMANTIC_VIEWS.isMigration());
+    }
+
+    SchemaScript mockAgentDependency(String name, String schema) {
+        String content = "CREATE OR REPLACE AGENT " + name + "\n" +
+                "  COMMENT = 'Test agent'\n" +
+                "  FROM SPECIFICATION\n" +
+                "  $$\n" +
+                "  tools:\n" +
+                "    - tool_spec:\n" +
+                "        type: \"cortex_search\"\n" +
+                "        name: \"Search1\"\n" +
+                "  $$;";
+        return ScriptFactory.getSchemaScript("TEST_DB", schema, ScriptObjectType.AGENTS, name, content);
+    }
+
+    @Test
+    void extractScriptDependenciesAgent() {
+        String content = "CREATE OR REPLACE AGENT TEST_SCHEMA.SALES_ASSISTANT\n" +
+                "  COMMENT = 'Sales assistant agent'\n" +
+                "  FROM SPECIFICATION\n" +
+                "  $$\n" +
+                "  tools:\n" +
+                "    - tool_spec:\n" +
+                "        type: \"cortex_analyst_text_to_sql\"\n" +
+                "        name: \"Analyst\"\n" +
+                "    - tool_spec:\n" +
+                "        type: \"cortex_search\"\n" +
+                "        name: \"Search\"\n" +
+                "  tool_resources:\n" +
+                "    Analyst:\n" +
+                "      semantic_view: \"TEST_SCHEMA.SALES_ANALYTICS\"\n" +
+                "    Search:\n" +
+                "      name: \"TEST_SCHEMA.PRODUCT_SEARCH\"\n" +
+                "  $$;";
+        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.AGENTS, "SALES_ASSISTANT", content);
+        SchemaScript dependency1 = mockSemanticViewDependency("SALES_ANALYTICS", "TEST_SCHEMA");
+        SchemaScript dependency2 = mockCortexSearchDependency("PRODUCT_SEARCH", "TEST_SCHEMA");
+        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());
+        changedScript.add(script);
+        changedScript.add(dependency1);
+        changedScript.add(dependency2);
+        dependencyExtractor.addScripts(changedScript);
+        Set<Script> expected = Set.of(
+                dependency1,
+                dependency2
+        );
+        Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
+        assertEquals(expected, actual, "Agent dependency extractor failed:");
+    }
+
+    @Test
+    void testAgentObjectType() {
+        assertEquals("AGENT", ScriptObjectType.AGENTS.getSingular());
+        assertEquals("AGENT", ScriptObjectType.AGENTS.getEscapedSingular());
+        assertEquals(ScriptObjectType.ObjectLevel.SCHEMA, ScriptObjectType.AGENTS.getLevel());
+        assertFalse(ScriptObjectType.AGENTS.isMigration());
+    }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java b/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
index 1783142..2764daa 100644
--- a/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
+++ b/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
@@ -173,6 +173,97 @@ void testBothModeUpdateHashes() throws SQLException {
         verify(mockConnection, atLeastOnce()).commit();
     }
 
+    @Test
+    void testCreateCortexSearchServiceScript() throws SQLException {
+        SchemaScript script = new SchemaScript(
+            "test/PRODUCT_SEARCH.sql",
+            "TEST_DB",
+            "TEST_SCHEMA",
+            "PRODUCT_SEARCH",
+            ScriptObjectType.CORTEX_SEARCH_SERVICES,
+            "CREATE OR REPLACE CORTEX SEARCH SERVICE TEST_DB.TEST_SCHEMA.PRODUCT_SEARCH\n" +
+            "  ON product_description\n" +
+            "  ATTRIBUTES product_name, category\n" +
+            "  WAREHOUSE = MY_WH\n" +
+            "  TARGET_LAG = '1 hour'\n" +
+            "AS (SELECT * FROM TEST_DB.TEST_SCHEMA.PRODUCTS);"
+        );
+        script.setHash("cortex_search_hash");
+
+        when(mockStatement.execute(anyString())).thenReturn(false);
+        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
+
+        scriptRepo.createScriptObject(script, false);
+
+        ArgumentCaptor<String> executeCaptor = ArgumentCaptor.forClass(String.class);
+        verify(mockStatement, times(1)).execute(executeCaptor.capture());
+        assertTrue(executeCaptor.getValue().contains("CORTEX SEARCH SERVICE"),
+            "Cortex Search Service DDL should be executed");
+
+        verify(mockConnection, atLeastOnce()).commit();
+    }
+
+    @Test
+    void testCreateSemanticViewScript() throws SQLException {
+        SchemaScript script = new SchemaScript(
+            "test/SALES_ANALYTICS.sql",
+            "TEST_DB",
+            "TEST_SCHEMA",
+            "SALES_ANALYTICS",
+            ScriptObjectType.SEMANTIC_VIEWS,
+            "CREATE OR REPLACE SEMANTIC VIEW TEST_DB.TEST_SCHEMA.SALES_ANALYTICS\n" +
+            "  TABLES (products AS TEST_DB.TEST_SCHEMA.PRODUCTS PRIMARY KEY (PRODUCT_ID))\n" +
+            "  DIMENSIONS (products.name AS products.NAME)\n" +
+            "  METRICS (products.revenue AS SUM(products.PRICE));"
+        );
+        script.setHash("semantic_view_hash");
+
+        when(mockStatement.execute(anyString())).thenReturn(false);
+        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
+
+        scriptRepo.createScriptObject(script, false);
+
+        ArgumentCaptor<String> executeCaptor = ArgumentCaptor.forClass(String.class);
+        verify(mockStatement, times(1)).execute(executeCaptor.capture());
+        assertTrue(executeCaptor.getValue().contains("SEMANTIC VIEW"),
+            "Semantic View DDL should be executed");
+
+        verify(mockConnection, atLeastOnce()).commit();
+    }
+
+    @Test
+    void testCreateAgentScript() throws SQLException {
+        SchemaScript script = new SchemaScript(
+            "test/SALES_ASSISTANT.sql",
+            "TEST_DB",
+            "TEST_SCHEMA",
+            "SALES_ASSISTANT",
+            ScriptObjectType.AGENTS,
+            "CREATE OR REPLACE AGENT TEST_DB.TEST_SCHEMA.SALES_ASSISTANT\n" +
+            "  COMMENT = 'Sales assistant agent'\n" +
+            "  FROM SPECIFICATION\n" +
+            "  $$\n" +
+            "  tools:\n" +
+            "    - tool_spec:\n" +
+            "        type: \"cortex_search\"\n" +
+            "        name: \"Search\"\n" +
+            "  $$;"
+        );
+        script.setHash("agent_hash");
+
+        when(mockStatement.execute(anyString())).thenReturn(false);
+        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
+
+        scriptRepo.createScriptObject(script, false);
+
+        ArgumentCaptor<String> executeCaptor = ArgumentCaptor.forClass(String.class);
+        verify(mockStatement, times(1)).execute(executeCaptor.capture());
+        assertTrue(executeCaptor.getValue().contains("AGENT"),
+            "Agent DDL should be executed");
+
+        verify(mockConnection, atLeastOnce()).commit();
+    }
+
     private ScriptRepo createScriptRepoWithMockedConnection() throws SQLException {
         Properties props = new Properties();
         props.setProperty("account", "test_account");
diff --git a/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java b/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
index c939395..63deb66 100644
--- a/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
+++ b/src/test/java/com/snowflake/dlsync/parser/SqlTokenizerTest.java
@@ -926,6 +926,118 @@ void parseAccountScriptTypeRoleMultipleMigrations() {
         assertEquals("user2", thirdMigration.getAuthor(), "Third author should be user2");
     }
 
+    // ===== Cortex Search Service Tests =====
+
+    @Test
+    void parseSchemaScriptTypeCortexSearchService() {
+        String filePath = "db_scripts/db1/schema1/CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.SQL";
+        String name = "PRODUCT_SEARCH.SQL";
+        String scriptType = "CORTEX_SEARCH_SERVICES";
+        String content = "CREATE OR REPLACE CORTEX SEARCH SERVICE db1.schema1.PRODUCT_SEARCH\n" +
+                "  ON product_description\n" +
+                "  ATTRIBUTES product_name, category\n" +
+                "  WAREHOUSE = MY_WH\n" +
+                "  TARGET_LAG = '1 hour'\n" +
+                "AS (SELECT * FROM db1.schema1.PRODUCTS);";
+
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("PRODUCT_SEARCH", script.getObjectName(), "Object name should be PRODUCT_SEARCH");
+        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
+        assertEquals(ScriptObjectType.CORTEX_SEARCH_SERVICES, script.getObjectType(), "Object type should be CORTEX_SEARCH_SERVICES");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+
+    // ===== Semantic View Tests =====
+
+    @Test
+    void parseSchemaScriptTypeSemanticView() {
+        String filePath = "db_scripts/db1/schema1/SEMANTIC_VIEWS/SALES_ANALYTICS.SQL";
+        String name = "SALES_ANALYTICS.SQL";
+        String scriptType = "SEMANTIC_VIEWS";
+        String content = "CREATE OR REPLACE SEMANTIC VIEW db1.schema1.SALES_ANALYTICS\n" +
+                "  TABLES (\n" +
+                "    products AS db1.schema1.PRODUCTS PRIMARY KEY (PRODUCT_ID)\n" +
+                "  )\n" +
+                "  DIMENSIONS (\n" +
+                "    products.product_name AS products.NAME\n" +
+                "  )\n" +
+                "  METRICS (\n" +
+                "    products.total_revenue AS SUM(products.PRICE)\n" +
+                "  );";
+
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("SALES_ANALYTICS", script.getObjectName(), "Object name should be SALES_ANALYTICS");
+        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
+        assertEquals(ScriptObjectType.SEMANTIC_VIEWS, script.getObjectType(), "Object type should be SEMANTIC_VIEWS");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+
+    // ===== Agent Tests =====
+
+    @Test
+    void parseSchemaScriptTypeAgent() {
+        String filePath = "db_scripts/db1/schema1/AGENTS/SALES_ASSISTANT.SQL";
+        String name = "SALES_ASSISTANT.SQL";
+        String scriptType = "AGENTS";
+        String content = "CREATE OR REPLACE AGENT db1.schema1.SALES_ASSISTANT\n" +
+                "  COMMENT = 'Sales assistant agent'\n" +
+                "  FROM SPECIFICATION\n" +
+                "  $$\n" +
+                "  tools:\n" +
+                "    - tool_spec:\n" +
+                "        type: \"cortex_search\"\n" +
+                "        name: \"Search\"\n" +
+                "  $$;";
+
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("SALES_ASSISTANT", script.getObjectName(), "Object name should be SALES_ASSISTANT");
+        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
+        assertEquals(ScriptObjectType.AGENTS, script.getObjectType(), "Object type should be AGENTS");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
+
+    @Test
+    void parseSchemaScriptTypeAgentWithProfile() {
+        String filePath = "db_scripts/db1/schema1/AGENTS/SUPPORT_AGENT.SQL";
+        String name = "SUPPORT_AGENT.SQL";
+        String scriptType = "AGENTS";
+        String content = "CREATE OR REPLACE AGENT db1.schema1.SUPPORT_AGENT\n" +
+                "  COMMENT = 'Customer support agent'\n" +
+                "  PROFILE = '{\"display_name\": \"Support Bot\", \"avatar\": \"support.png\", \"color\": \"green\"}'\n" +
+                "  FROM SPECIFICATION\n" +
+                "  $$\n" +
+                "  models:\n" +
+                "    orchestration: claude-4-sonnet\n" +
+                "  orchestration:\n" +
+                "    budget:\n" +
+                "      seconds: 30\n" +
+                "      tokens: 16000\n" +
+                "  tools:\n" +
+                "    - tool_spec:\n" +
+                "        type: \"cortex_analyst_text_to_sql\"\n" +
+                "        name: \"Analyst\"\n" +
+                "  $$;";
+
+        SchemaScript script = SqlTokenizer.parseSchemaScript(filePath, name, scriptType, content);
+
+        assertNotNull(script, "Script should not be null");
+        assertEquals("SUPPORT_AGENT", script.getObjectName(), "Object name should be SUPPORT_AGENT");
+        assertEquals("db1".toUpperCase(), script.getDatabaseName(), "Database name should be db1");
+        assertEquals("schema1".toUpperCase(), script.getSchemaName(), "Schema name should be schema1");
+        assertEquals(ScriptObjectType.AGENTS, script.getObjectType(), "Object type should be AGENTS");
+        assertEquals(content, script.getContent(), "Script content should match the input content");
+    }
 
 
 }
\ No newline at end of file

From 1a6c759cabd7197ce84adf0dfa07698d4b628c6b Mon Sep 17 00:00:00 2001
From: Arjun Danda Sureshbabu <a.sureshbabu@snowflake.com>
Date: Wed, 4 Feb 2026 13:12:42 -0800
Subject: [PATCH 03/11] adding README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b768f84..8ab5e9b 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ Where
   - Other account-level objects (users, resource monitors, integrations, etc.)
 - **database_name_*:** is the database name of your project, 
 - **schema_name_*:** are schemas inside the database, 
-- **object_type:** is type of the object only 1 of the following (VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, STREAMLITS, PIPES, ALERTS, DYNAMIC_TABLES, MASKING_POLICIES),
+- **object_type:** is type of the object only 1 of the following (VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, STREAMLITS, PIPES, ALERTS, DYNAMIC_TABLES, MASKING_POLICIES, CORTEX_SEARCH_SERVICES, SEMANTIC_VIEWS, AGENTS),
 - **object_name_*.sql:** are individual database object scripts.
 - **config.yml:** is a configuration file used to configure DLSync behavior.
 - **parameter-[profile-*].properties:** is parameter to value map file. This is going to be used by corresponding individual instances of your database.
@@ -131,7 +131,7 @@ For example, if you have a view named `SAMPLE_VIEW` in schema `MY_SCHEMA` in dat
 
 The structure and content of the scripts differ based on the type of script. This tool categorizes scripts into 2 types: Declarative scripts and Migration scripts.
 #### 1. Declarative Script
-This type of script is used for object types of VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, PIPES, MASKING_POLICIES, STREAMLITS, RESOURCE_MONITORS, NETWORK_POLICIES, SESSION_POLICIES, PASSWORD_POLICIES, AUTHENTICATION_POLICIES, API_INTEGRATIONS, NOTIFICATION_INTEGRATIONS, SECURITY_INTEGRATIONS, STORAGE_INTEGRATIONS, and WAREHOUSES.
+This type of script is used for object types of VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, PIPES, MASKING_POLICIES, CORTEX_SEARCH_SERVICES, SEMANTIC_VIEWS, AGENTS, STREAMLITS, RESOURCE_MONITORS, NETWORK_POLICIES, SESSION_POLICIES, PASSWORD_POLICIES, AUTHENTICATION_POLICIES, API_INTEGRATIONS, NOTIFICATION_INTEGRATIONS, SECURITY_INTEGRATIONS, STORAGE_INTEGRATIONS, and WAREHOUSES.
 In this type of script, you define the current state (desired state) of the object.
 When a change is made to the script, DLSync replaces the current object with the updated definition. 
 These types of scripts must always have a `create or replace` statement. Every time you make a change to the script, DLSync will replace the object with the new definition.

From d513e293fc0437d8cd07b959ca91c439c7355dfe Mon Sep 17 00:00:00 2001
From: Arjun Danda Sureshbabu <a.sureshbabu@snowflake.com>
Date: Wed, 4 Feb 2026 13:38:52 -0800
Subject: [PATCH 04/11] Update the example scripts

---
 .../MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql    |  6 +++---
 .../CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql | 10 +++++-----
 .../SEMANTIC_VIEWS/SALES_ANALYTICS.sql        | 20 ++++++++-----------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql b/example_scripts/main/example_db/MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql
index 0153c9c..53f891b 100644
--- a/example_scripts/main/example_db/MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/AGENTS/SALES_ASSISTANT.sql
@@ -18,8 +18,8 @@ CREATE OR REPLACE AGENT ${EXAMPLE_DB}.${MAIN_SCHEMA}.SALES_ASSISTANT
     sample_questions:
       - question: "What products do we have in stock?"
         answer: "I'll search our product catalog to find available items."
-      - question: "What were our top selling products last month?"
-        answer: "I'll analyze our sales data to find the best performers."
+      - question: "How many orders were placed today?"
+        answer: "I'll analyze our sales data to find the order count."
 
   tools:
     - tool_spec:
@@ -29,7 +29,7 @@ CREATE OR REPLACE AGENT ${EXAMPLE_DB}.${MAIN_SCHEMA}.SALES_ASSISTANT
     - tool_spec:
         type: "cortex_search"
         name: "ProductSearch"
-        description: "Searches product catalog and documentation"
+        description: "Searches product catalog"
 
   tool_resources:
     SalesAnalyst:
diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql b/example_scripts/main/example_db/MAIN_SCHEMA/CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql
index a24f018..4660c27 100644
--- a/example_scripts/main/example_db/MAIN_SCHEMA/CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/CORTEX_SEARCH_SERVICES/PRODUCT_SEARCH.sql
@@ -1,12 +1,12 @@
 CREATE OR REPLACE CORTEX SEARCH SERVICE ${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCT_SEARCH
-  ON product_description
-  ATTRIBUTES product_name, category
+  ON PRODUCT_NAME
+  ATTRIBUTES PRICE, STOCK
   WAREHOUSE = ${MY_WAREHOUSE}
   TARGET_LAG = '1 hour'
 AS (
   SELECT
-    product_name,
-    product_description,
-    category
+    PRODUCT_NAME,
+    PRICE,
+    STOCK
   FROM ${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCTS
 );
diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/SEMANTIC_VIEWS/SALES_ANALYTICS.sql b/example_scripts/main/example_db/MAIN_SCHEMA/SEMANTIC_VIEWS/SALES_ANALYTICS.sql
index 02807ba..c21de60 100644
--- a/example_scripts/main/example_db/MAIN_SCHEMA/SEMANTIC_VIEWS/SALES_ANALYTICS.sql
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/SEMANTIC_VIEWS/SALES_ANALYTICS.sql
@@ -1,33 +1,29 @@
 CREATE OR REPLACE SEMANTIC VIEW ${EXAMPLE_DB}.${MAIN_SCHEMA}.SALES_ANALYTICS
   TABLES (
     products AS ${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCTS
-      PRIMARY KEY (PRODUCT_ID)
+      PRIMARY KEY (ID)
       COMMENT = 'Product catalog table',
     orders AS ${EXAMPLE_DB}.${MAIN_SCHEMA}.ORDERS
-      PRIMARY KEY (ORDER_ID)
+      PRIMARY KEY (ID)
       COMMENT = 'Customer orders table'
   )
   RELATIONSHIPS (
     orders (PRODUCT_ID) REFERENCES products
   )
   DIMENSIONS (
-    products.product_name AS products.NAME
+    products.product_name AS products.PRODUCT_NAME
       WITH SYNONYMS = ('product', 'item')
       COMMENT = 'Name of the product',
-    products.category AS products.CATEGORY
-      WITH SYNONYMS = ('type', 'group')
-      COMMENT = 'Product category',
     orders.order_date AS orders.ORDER_DATE
       WITH SYNONYMS = ('date', 'purchase date')
       COMMENT = 'Date when order was placed'
   )
   METRICS (
-    orders.total_revenue AS SUM(orders.PRICE * orders.QUANTITY)
-      WITH SYNONYMS = ('revenue', 'sales')
-      COMMENT = 'Total revenue from orders',
-    orders.order_count AS COUNT(orders.ORDER_ID)
+    orders.total_quantity AS SUM(orders.QUANTITY)
+      WITH SYNONYMS = ('quantity', 'units sold')
+      COMMENT = 'Total quantity ordered',
+    orders.order_count AS COUNT(orders.ID)
       WITH SYNONYMS = ('number of orders', 'count')
       COMMENT = 'Total number of orders'
   )
-  COMMENT = 'Semantic view for sales analytics'
-  AI_SQL_GENERATION 'When asked about sales, use total_revenue metric. When asked about orders, use order_count metric.';
+  COMMENT = 'Semantic view for sales analytics';

From 9dc27e3f97f6a146ee68e36556b6995e2883ab7b Mon Sep 17 00:00:00 2001
From: Alka Rana <alka.rana@snowflake.com>
Date: Mon, 9 Feb 2026 15:36:54 +0530
Subject: [PATCH 05/11] Added support for notebook type object

---
 CHANGELOG.md                                                | 4 ++++
 README.md                                                   | 6 +++---
 .../MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL       | 5 +++++
 gradle.properties                                           | 2 +-
 .../java/com/snowflake/dlsync/models/ScriptObjectType.java  | 1 +
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 example_scripts/main/example_db/MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f59dfa8..6333cfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # DLSync Changelog
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [3.1.0] - 2026-02-09
+### Added
+- Added support for Snowflake Notebook object type
+
 ## [3.0.1] - 2026-02-05
 ### Fixed
 - Fixed session context issue when managing account-level objects (databases, schemas). DLSync metadata tables now use fully qualified names to prevent "table does not exist" errors after Snowflake automatically switches session context.
diff --git a/README.md b/README.md
index b768f84..91db865 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ Where
   - Other account-level objects (users, resource monitors, integrations, etc.)
 - **database_name_*:** is the database name of your project, 
 - **schema_name_*:** are schemas inside the database, 
-- **object_type:** is type of the object only 1 of the following (VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, STREAMLITS, PIPES, ALERTS, DYNAMIC_TABLES, MASKING_POLICIES),
+- **object_type:** is type of the object only 1 of the following (VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, STREAMLITS, PIPES, ALERTS, DYNAMIC_TABLES, MASKING_POLICIES, NOTEBOOKS),
 - **object_name_*.sql:** are individual database object scripts.
 - **config.yml:** is a configuration file used to configure DLSync behavior.
 - **parameter-[profile-*].properties:** is parameter to value map file. This is going to be used by corresponding individual instances of your database.
@@ -131,7 +131,7 @@ For example, if you have a view named `SAMPLE_VIEW` in schema `MY_SCHEMA` in dat
 
 The structure and content of the scripts differ based on the type of script. This tool categorizes scripts into 2 types: Declarative scripts and Migration scripts.
 #### 1. Declarative Script
-This type of script is used for object types of VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, PIPES, MASKING_POLICIES, STREAMLITS, RESOURCE_MONITORS, NETWORK_POLICIES, SESSION_POLICIES, PASSWORD_POLICIES, AUTHENTICATION_POLICIES, API_INTEGRATIONS, NOTIFICATION_INTEGRATIONS, SECURITY_INTEGRATIONS, STORAGE_INTEGRATIONS, and WAREHOUSES.
+This type of script is used for object types of VIEWS, FUNCTIONS, PROCEDURES, FILE_FORMATS, PIPES, MASKING_POLICIES, STREAMLITS, NOTEBOOKS, RESOURCE_MONITORS, NETWORK_POLICIES, SESSION_POLICIES, PASSWORD_POLICIES, AUTHENTICATION_POLICIES, API_INTEGRATIONS, NOTIFICATION_INTEGRATIONS, SECURITY_INTEGRATIONS, STORAGE_INTEGRATIONS, and WAREHOUSES.
 In this type of script, you define the current state (desired state) of the object.
 When a change is made to the script, DLSync replaces the current object with the updated definition. 
 These types of scripts must always have a `create or replace` statement. Every time you make a change to the script, DLSync will replace the object with the new definition.
@@ -450,7 +450,7 @@ The role must have privileges to create and manage DLSync tracking tables in the
 > **Note:** the database and schema specified in the connection will be used to store the DLSync tracking tables.
 
 ### Database-Level Objects
-For managing database-level objects (VIEWS, FUNCTIONS, PROCEDURES, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, ALERTS, DYNAMIC_TABLES, FILE_FORMATS, PIPES, MASKING_POLICIES), the role must have:
+For managing database-level objects (VIEWS, FUNCTIONS, PROCEDURES, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, ALERTS, DYNAMIC_TABLES, FILE_FORMATS, PIPES, MASKING_POLICIES, NOTEBOOKS), the role must have:
 - **USAGE** on the target schema
 - **CREATE** privileges for the specific object types being deployed (CREATE VIEW, CREATE FUNCTION, CREATE TABLE, etc.)
 - **ALTER** privileges on existing objects in the schema
diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL b/example_scripts/main/example_db/MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL
new file mode 100644
index 0000000..a55b018
--- /dev/null
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL
@@ -0,0 +1,5 @@
+CREATE OR REPLACE NOTEBOOK ${EXAMPLE_DB}.${MAIN_SCHEMA}.SALES_ANALYSIS_NOTEBOOK
+    FROM '@${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCT_DATA_STAGE'
+    MAIN_FILE='sales_analysis.ipynb'
+    QUERY_WAREHOUSE='${MY_WAREHOUSE}'
+;
diff --git a/gradle.properties b/gradle.properties
index 0f2f246..efbd9d0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-releaseVersion=3.0.1
\ No newline at end of file
+releaseVersion=3.1.0
\ No newline at end of file
diff --git a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
index 1673c8b..e311ed0 100644
--- a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
+++ b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
@@ -19,6 +19,7 @@ public enum ScriptObjectType {
     SECURITY_INTEGRATIONS("SECURITY INTEGRATION", ObjectLevel.ACCOUNT, false),
     STORAGE_INTEGRATIONS("STORAGE INTEGRATION", ObjectLevel.ACCOUNT, false),
     WAREHOUSES("WAREHOUSE", ObjectLevel.ACCOUNT, false),
+    NOTEBOOKS("NOTEBOOK", ObjectLevel.SCHEMA, false),
 
     // Migration-enabled objects
     TABLES("TABLE", ObjectLevel.SCHEMA, true),

From e0cb866477265dd0c99282f2220b3e59b500b46d Mon Sep 17 00:00:00 2001
From: Alka Rana <alka.rana@snowflake.com>
Date: Mon, 9 Feb 2026 16:08:36 +0530
Subject: [PATCH 06/11] Updated example script with comment

---
 .../MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example_scripts/main/example_db/MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL b/example_scripts/main/example_db/MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL
index a55b018..096dd49 100644
--- a/example_scripts/main/example_db/MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/NOTEBOOKS/SALES_ANALYSIS_NOTEBOOK.SQL
@@ -1,5 +1,5 @@
 CREATE OR REPLACE NOTEBOOK ${EXAMPLE_DB}.${MAIN_SCHEMA}.SALES_ANALYSIS_NOTEBOOK
-    FROM '@${EXAMPLE_DB}.${MAIN_SCHEMA}.PRODUCT_DATA_STAGE'
     MAIN_FILE='sales_analysis.ipynb'
     QUERY_WAREHOUSE='${MY_WAREHOUSE}'
+    COMMENT = 'Example notebook deployed via DLSync'
 ;

From 2b6f25362993ff1c2a0ddf2a47b6795562651e54 Mon Sep 17 00:00:00 2001
From: Arjun Danda Sureshbabu <a.sureshbabu@snowflake.com>
Date: Mon, 9 Feb 2026 14:43:56 -0800
Subject: [PATCH 07/11] Removed tests scripts

---
 .../dependency/DependencyExtractorTest.java   | 167 ------------------
 .../snowflake/dlsync/doa/ScriptRepoTest.java  |  92 +---------
 2 files changed, 1 insertion(+), 258 deletions(-)

diff --git a/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java b/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
index 32314c2..b986dce 100644
--- a/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
+++ b/src/test/java/com/snowflake/dlsync/dependency/DependencyExtractorTest.java
@@ -388,172 +388,5 @@ void extractScriptDependenciesIdentifierInQuotes() {
 
     }
 
-    SchemaScript mockCortexSearchDependency(String name, String schema) {
-        String content = "CREATE OR REPLACE CORTEX SEARCH SERVICE " + name + "\n" +
-                "  ON search_column\n" +
-                "  ATTRIBUTES attr1, attr2\n" +
-                "  WAREHOUSE = MY_WH\n" +
-                "  TARGET_LAG = '1 hour'\n" +
-                "AS (SELECT * FROM SOURCE_TABLE);";
-        return ScriptFactory.getSchemaScript("TEST_DB", schema, ScriptObjectType.CORTEX_SEARCH_SERVICES, name, content);
-    }
-
-    @Test
-    void extractScriptDependenciesCortexSearchService() {
-        String content = "CREATE OR REPLACE CORTEX SEARCH SERVICE TEST_SCHEMA.PRODUCT_SEARCH\n" +
-                "  ON product_description\n" +
-                "  ATTRIBUTES product_name, category\n" +
-                "  WAREHOUSE = MY_WH\n" +
-                "  TARGET_LAG = '1 hour'\n" +
-                "AS (\n" +
-                "  SELECT product_name, product_description, category\n" +
-                "  FROM TEST_SCHEMA.PRODUCTS\n" +
-                ");";
-        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.CORTEX_SEARCH_SERVICES, "PRODUCT_SEARCH", content);
-        MigrationScript dependency1 = mockTableDependency("PRODUCTS", "TEST_SCHEMA");
-        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());
-        changedScript.add(script);
-        changedScript.add(dependency1);
-        dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
-                dependency1
-        );
-        Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
-        assertEquals(expected, actual, "Cortex Search Service dependency extractor failed:");
-    }
-
-    @Test
-    void extractScriptDependenciesCortexSearchServiceWithMultipleTables() {
-        String content = "CREATE OR REPLACE CORTEX SEARCH SERVICE TEST_SCHEMA.UNIFIED_SEARCH\n" +
-                "  ON content\n" +
-                "  ATTRIBUTES title, category\n" +
-                "  WAREHOUSE = MY_WH\n" +
-                "  TARGET_LAG = '1 hour'\n" +
-                "AS (\n" +
-                "  SELECT title, content, category FROM TEST_SCHEMA.ARTICLES\n" +
-                "  UNION ALL\n" +
-                "  SELECT name AS title, description AS content, type AS category FROM TEST_SCHEMA.PRODUCTS\n" +
-                ");";
-        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.CORTEX_SEARCH_SERVICES, "UNIFIED_SEARCH", content);
-        MigrationScript dependency1 = mockTableDependency("ARTICLES", "TEST_SCHEMA");
-        MigrationScript dependency2 = mockTableDependency("PRODUCTS", "TEST_SCHEMA");
-        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());
-        changedScript.add(script);
-        changedScript.add(dependency1);
-        changedScript.add(dependency2);
-        dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
-                dependency1,
-                dependency2
-        );
-        Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
-        assertEquals(expected, actual, "Cortex Search Service with multiple tables dependency extractor failed:");
-    }
-
-    @Test
-    void testCortexSearchServiceObjectType() {
-        assertEquals("CORTEX SEARCH SERVICE", ScriptObjectType.CORTEX_SEARCH_SERVICES.getSingular());
-        assertEquals("CORTEX_SEARCH_SERVICE", ScriptObjectType.CORTEX_SEARCH_SERVICES.getEscapedSingular());
-        assertEquals(ScriptObjectType.ObjectLevel.SCHEMA, ScriptObjectType.CORTEX_SEARCH_SERVICES.getLevel());
-        assertFalse(ScriptObjectType.CORTEX_SEARCH_SERVICES.isMigration());
-    }
-
-    SchemaScript mockSemanticViewDependency(String name, String schema) {
-        String content = "CREATE OR REPLACE SEMANTIC VIEW " + name + "\n" +
-                "  TABLES (t AS SOURCE_TABLE PRIMARY KEY (ID))\n" +
-                "  DIMENSIONS (t.dim1 AS t.COL1)\n" +
-                "  METRICS (t.metric1 AS SUM(t.COL2));";
-        return ScriptFactory.getSchemaScript("TEST_DB", schema, ScriptObjectType.SEMANTIC_VIEWS, name, content);
-    }
-
-    @Test
-    void extractScriptDependenciesSemanticView() {
-        String content = "CREATE OR REPLACE SEMANTIC VIEW TEST_SCHEMA.SALES_ANALYTICS\n" +
-                "  TABLES (\n" +
-                "    products AS TEST_SCHEMA.PRODUCTS PRIMARY KEY (PRODUCT_ID),\n" +
-                "    orders AS TEST_SCHEMA.ORDERS PRIMARY KEY (ORDER_ID)\n" +
-                "  )\n" +
-                "  RELATIONSHIPS (orders (PRODUCT_ID) REFERENCES products)\n" +
-                "  DIMENSIONS (products.name AS products.NAME)\n" +
-                "  METRICS (orders.revenue AS SUM(orders.PRICE));";
-        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.SEMANTIC_VIEWS, "SALES_ANALYTICS", content);
-        MigrationScript dependency1 = mockTableDependency("PRODUCTS", "TEST_SCHEMA");
-        MigrationScript dependency2 = mockTableDependency("ORDERS", "TEST_SCHEMA");
-        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());
-        changedScript.add(script);
-        changedScript.add(dependency1);
-        changedScript.add(dependency2);
-        dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
-                dependency1,
-                dependency2
-        );
-        Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
-        assertEquals(expected, actual, "Semantic View dependency extractor failed:");
-    }
-
-    @Test
-    void testSemanticViewObjectType() {
-        assertEquals("SEMANTIC VIEW", ScriptObjectType.SEMANTIC_VIEWS.getSingular());
-        assertEquals("SEMANTIC_VIEW", ScriptObjectType.SEMANTIC_VIEWS.getEscapedSingular());
-        assertEquals(ScriptObjectType.ObjectLevel.SCHEMA, ScriptObjectType.SEMANTIC_VIEWS.getLevel());
-        assertFalse(ScriptObjectType.SEMANTIC_VIEWS.isMigration());
-    }
-
-    SchemaScript mockAgentDependency(String name, String schema) {
-        String content = "CREATE OR REPLACE AGENT " + name + "\n" +
-                "  COMMENT = 'Test agent'\n" +
-                "  FROM SPECIFICATION\n" +
-                "  $$\n" +
-                "  tools:\n" +
-                "    - tool_spec:\n" +
-                "        type: \"cortex_search\"\n" +
-                "        name: \"Search1\"\n" +
-                "  $$;";
-        return ScriptFactory.getSchemaScript("TEST_DB", schema, ScriptObjectType.AGENTS, name, content);
-    }
-
-    @Test
-    void extractScriptDependenciesAgent() {
-        String content = "CREATE OR REPLACE AGENT TEST_SCHEMA.SALES_ASSISTANT\n" +
-                "  COMMENT = 'Sales assistant agent'\n" +
-                "  FROM SPECIFICATION\n" +
-                "  $$\n" +
-                "  tools:\n" +
-                "    - tool_spec:\n" +
-                "        type: \"cortex_analyst_text_to_sql\"\n" +
-                "        name: \"Analyst\"\n" +
-                "    - tool_spec:\n" +
-                "        type: \"cortex_search\"\n" +
-                "        name: \"Search\"\n" +
-                "  tool_resources:\n" +
-                "    Analyst:\n" +
-                "      semantic_view: \"TEST_SCHEMA.SALES_ANALYTICS\"\n" +
-                "    Search:\n" +
-                "      name: \"TEST_SCHEMA.PRODUCT_SEARCH\"\n" +
-                "  $$;";
-        SchemaScript script = ScriptFactory.getSchemaScript("TEST_DB", "TEST_SCHEMA", ScriptObjectType.AGENTS, "SALES_ASSISTANT", content);
-        SchemaScript dependency1 = mockSemanticViewDependency("SALES_ANALYTICS", "TEST_SCHEMA");
-        SchemaScript dependency2 = mockCortexSearchDependency("PRODUCT_SEARCH", "TEST_SCHEMA");
-        List<Script> changedScript = mockScripts().stream().map(schemaScript -> (Script)schemaScript).collect(Collectors.toList());
-        changedScript.add(script);
-        changedScript.add(dependency1);
-        changedScript.add(dependency2);
-        dependencyExtractor.addScripts(changedScript);
-        Set<Script> expected = Set.of(
-                dependency1,
-                dependency2
-        );
-        Set<Script> actual = dependencyExtractor.extractScriptDependencies(script);
-        assertEquals(expected, actual, "Agent dependency extractor failed:");
-    }
-
-    @Test
-    void testAgentObjectType() {
-        assertEquals("AGENT", ScriptObjectType.AGENTS.getSingular());
-        assertEquals("AGENT", ScriptObjectType.AGENTS.getEscapedSingular());
-        assertEquals(ScriptObjectType.ObjectLevel.SCHEMA, ScriptObjectType.AGENTS.getLevel());
-        assertFalse(ScriptObjectType.AGENTS.isMigration());
-    }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java b/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
index 2764daa..c0723e0 100644
--- a/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
+++ b/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
@@ -173,102 +173,12 @@ void testBothModeUpdateHashes() throws SQLException {
         verify(mockConnection, atLeastOnce()).commit();
     }
 
-    @Test
-    void testCreateCortexSearchServiceScript() throws SQLException {
-        SchemaScript script = new SchemaScript(
-            "test/PRODUCT_SEARCH.sql",
-            "TEST_DB",
-            "TEST_SCHEMA",
-            "PRODUCT_SEARCH",
-            ScriptObjectType.CORTEX_SEARCH_SERVICES,
-            "CREATE OR REPLACE CORTEX SEARCH SERVICE TEST_DB.TEST_SCHEMA.PRODUCT_SEARCH\n" +
-            "  ON product_description\n" +
-            "  ATTRIBUTES product_name, category\n" +
-            "  WAREHOUSE = MY_WH\n" +
-            "  TARGET_LAG = '1 hour'\n" +
-            "AS (SELECT * FROM TEST_DB.TEST_SCHEMA.PRODUCTS);"
-        );
-        script.setHash("cortex_search_hash");
-
-        when(mockStatement.execute(anyString())).thenReturn(false);
-        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
-
-        scriptRepo.createScriptObject(script, false);
-
-        ArgumentCaptor<String> executeCaptor = ArgumentCaptor.forClass(String.class);
-        verify(mockStatement, times(1)).execute(executeCaptor.capture());
-        assertTrue(executeCaptor.getValue().contains("CORTEX SEARCH SERVICE"),
-            "Cortex Search Service DDL should be executed");
-
-        verify(mockConnection, atLeastOnce()).commit();
-    }
-
-    @Test
-    void testCreateSemanticViewScript() throws SQLException {
-        SchemaScript script = new SchemaScript(
-            "test/SALES_ANALYTICS.sql",
-            "TEST_DB",
-            "TEST_SCHEMA",
-            "SALES_ANALYTICS",
-            ScriptObjectType.SEMANTIC_VIEWS,
-            "CREATE OR REPLACE SEMANTIC VIEW TEST_DB.TEST_SCHEMA.SALES_ANALYTICS\n" +
-            "  TABLES (products AS TEST_DB.TEST_SCHEMA.PRODUCTS PRIMARY KEY (PRODUCT_ID))\n" +
-            "  DIMENSIONS (products.name AS products.NAME)\n" +
-            "  METRICS (products.revenue AS SUM(products.PRICE));"
-        );
-        script.setHash("semantic_view_hash");
-
-        when(mockStatement.execute(anyString())).thenReturn(false);
-        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
-
-        scriptRepo.createScriptObject(script, false);
-
-        ArgumentCaptor<String> executeCaptor = ArgumentCaptor.forClass(String.class);
-        verify(mockStatement, times(1)).execute(executeCaptor.capture());
-        assertTrue(executeCaptor.getValue().contains("SEMANTIC VIEW"),
-            "Semantic View DDL should be executed");
-
-        verify(mockConnection, atLeastOnce()).commit();
-    }
-
-    @Test
-    void testCreateAgentScript() throws SQLException {
-        SchemaScript script = new SchemaScript(
-            "test/SALES_ASSISTANT.sql",
-            "TEST_DB",
-            "TEST_SCHEMA",
-            "SALES_ASSISTANT",
-            ScriptObjectType.AGENTS,
-            "CREATE OR REPLACE AGENT TEST_DB.TEST_SCHEMA.SALES_ASSISTANT\n" +
-            "  COMMENT = 'Sales assistant agent'\n" +
-            "  FROM SPECIFICATION\n" +
-            "  $$\n" +
-            "  tools:\n" +
-            "    - tool_spec:\n" +
-            "        type: \"cortex_search\"\n" +
-            "        name: \"Search\"\n" +
-            "  $$;"
-        );
-        script.setHash("agent_hash");
-
-        when(mockStatement.execute(anyString())).thenReturn(false);
-        when(mockPreparedStatement.executeUpdate()).thenReturn(1);
-
-        scriptRepo.createScriptObject(script, false);
-
-        ArgumentCaptor<String> executeCaptor = ArgumentCaptor.forClass(String.class);
-        verify(mockStatement, times(1)).execute(executeCaptor.capture());
-        assertTrue(executeCaptor.getValue().contains("AGENT"),
-            "Agent DDL should be executed");
-
-        verify(mockConnection, atLeastOnce()).commit();
-    }
-
     private ScriptRepo createScriptRepoWithMockedConnection() throws SQLException {
         Properties props = new Properties();
         props.setProperty("account", "test_account");
         return new ScriptRepo(mockConnection, props);
     }
+
 }
 
 

From 6230445c7df2eade94aa6012e267f70e224f1568 Mon Sep 17 00:00:00 2001
From: Arjun Danda Sureshbabu <a.sureshbabu@snowflake.com>
Date: Mon, 9 Feb 2026 14:44:32 -0800
Subject: [PATCH 08/11] updated tests

---
 src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java b/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
index c0723e0..1783142 100644
--- a/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
+++ b/src/test/java/com/snowflake/dlsync/doa/ScriptRepoTest.java
@@ -178,7 +178,6 @@ private ScriptRepo createScriptRepoWithMockedConnection() throws SQLException {
         props.setProperty("account", "test_account");
         return new ScriptRepo(mockConnection, props);
     }
-
 }
 
 

From 62cf24fa8b1e5d97cadd6fbcbfaa9ccef6fbe49b Mon Sep 17 00:00:00 2001
From: Ytbarek Hailu <ytbarek.hailu@snowflake.com>
Date: Mon, 9 Feb 2026 16:49:35 -0800
Subject: [PATCH 09/11] Fixed the following    1. fix for rollback for
 undeployed declarative scripts    2. moved session policy, authentication
 policy and password policy to schema level objects    3. fix for dependecy
 override for not found scripts

---
 .gitignore                                                 | 1 +
 README.md                                                  | 7 +++----
 .../MAIN_SCHEMA}/AUTHENTICATION_POLICIES/MFA_POLICY.SQL    | 2 +-
 .../PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL         | 2 +-
 .../SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL            | 2 +-
 src/main/java/com/snowflake/dlsync/ChangeManager.java      | 1 +
 .../com/snowflake/dlsync/dependency/DependencyGraph.java   | 6 ++++--
 src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java     | 4 ++++
 .../java/com/snowflake/dlsync/models/ScriptObjectType.java | 6 +++---
 9 files changed, 19 insertions(+), 12 deletions(-)
 rename example_scripts/main/{ACCOUNT => example_db/MAIN_SCHEMA}/AUTHENTICATION_POLICIES/MFA_POLICY.SQL (66%)
 rename example_scripts/main/{ACCOUNT => example_db/MAIN_SCHEMA}/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL (75%)
 rename example_scripts/main/{ACCOUNT => example_db/MAIN_SCHEMA}/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL (58%)

diff --git a/.gitignore b/.gitignore
index e5e362a..da343c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ out/
 *.pem
 *.pub
 /created_scripts/
+/local/
\ No newline at end of file
diff --git a/README.md b/README.md
index 8ab5e9b..c04a1ac 100644
--- a/README.md
+++ b/README.md
@@ -450,7 +450,7 @@ The role must have privileges to create and manage DLSync tracking tables in the
 > **Note:** the database and schema specified in the connection will be used to store the DLSync tracking tables.
 
 ### Database-Level Objects
-For managing database-level objects (VIEWS, FUNCTIONS, PROCEDURES, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, ALERTS, DYNAMIC_TABLES, FILE_FORMATS, PIPES, MASKING_POLICIES), the role must have:
+For managing database-level objects (VIEWS, FUNCTIONS, PROCEDURES, TABLES, SEQUENCES, STAGES, STREAMS, TASKS, ALERTS, DYNAMIC_TABLES, FILE_FORMATS, PIPES, MASKING_POLICIES, SESSION_POLICIES, PASSWORD_POLICIES, AUTHENTICATION_POLICIES), the role must have:
 - **USAGE** on the target schema
 - **CREATE** privileges for the specific object types being deployed (CREATE VIEW, CREATE FUNCTION, CREATE TABLE, etc.)
 - **ALTER** privileges on existing objects in the schema
@@ -465,9 +465,8 @@ For managing account-level objects, the role must have:
 - **CREATE INTEGRATION** (for SECURITY_INTEGRATIONS, STORAGE_INTEGRATIONS, NOTIFICATION_INTEGRATIONS, API_INTEGRATIONS)
 - **CREATE RESOURCE MONITOR** (for RESOURCE_MONITORS)
 - **CREATE NETWORK POLICY** (for NETWORK_POLICIES)
-- **CREATE SESSION POLICY** (for SESSION_POLICIES)
-- **CREATE PASSWORD POLICY** (for PASSWORD_POLICIES)
-- **CREATE AUTHENTICATION POLICY** (for AUTHENTICATION_POLICIES)
+
+> **Note:** SESSION_POLICIES, PASSWORD_POLICIES, and AUTHENTICATION_POLICIES are schema-level objects (created within a schema) but can be applied to accounts or users via `ALTER ACCOUNT SET` or `ALTER USER SET`.
 
 ## DLSync Metadata Tables
 DLSync stores script metadata, deployment history, and logs in the database.
diff --git a/example_scripts/main/ACCOUNT/AUTHENTICATION_POLICIES/MFA_POLICY.SQL b/example_scripts/main/example_db/MAIN_SCHEMA/AUTHENTICATION_POLICIES/MFA_POLICY.SQL
similarity index 66%
rename from example_scripts/main/ACCOUNT/AUTHENTICATION_POLICIES/MFA_POLICY.SQL
rename to example_scripts/main/example_db/MAIN_SCHEMA/AUTHENTICATION_POLICIES/MFA_POLICY.SQL
index 330eb0d..cd9dddd 100644
--- a/example_scripts/main/ACCOUNT/AUTHENTICATION_POLICIES/MFA_POLICY.SQL
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/AUTHENTICATION_POLICIES/MFA_POLICY.SQL
@@ -1,4 +1,4 @@
-CREATE OR REPLACE AUTHENTICATION POLICY mfa_policy
+CREATE OR REPLACE AUTHENTICATION POLICY ${EXAMPLE_DB}.${MAIN_SCHEMA}.MFA_POLICY
   AUTHENTICATION_METHODS = ('PASSWORD', 'KEYPAIR')
   MFA_ENROLLMENT = 'REQUIRED'
   CLIENT_TYPES = ('ALL')
diff --git a/example_scripts/main/ACCOUNT/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL b/example_scripts/main/example_db/MAIN_SCHEMA/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL
similarity index 75%
rename from example_scripts/main/ACCOUNT/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL
rename to example_scripts/main/example_db/MAIN_SCHEMA/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL
index 5702989..a4623a3 100644
--- a/example_scripts/main/ACCOUNT/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/PASSWORD_POLICIES/PASSWORD_STRENGTH_POLICY.SQL
@@ -1,4 +1,4 @@
-CREATE OR REPLACE PASSWORD POLICY password_strength_policy
+CREATE OR REPLACE PASSWORD POLICY ${EXAMPLE_DB}.${MAIN_SCHEMA}.PASSWORD_STRENGTH_POLICY
   PASSWORD_MIN_LENGTH = 12
   PASSWORD_MAX_LENGTH = 256
   PASSWORD_MIN_UPPER_CASE_CHARS = 1
diff --git a/example_scripts/main/ACCOUNT/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL b/example_scripts/main/example_db/MAIN_SCHEMA/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL
similarity index 58%
rename from example_scripts/main/ACCOUNT/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL
rename to example_scripts/main/example_db/MAIN_SCHEMA/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL
index d221931..09dc62d 100644
--- a/example_scripts/main/ACCOUNT/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL
+++ b/example_scripts/main/example_db/MAIN_SCHEMA/SESSION_POLICIES/SESSION_TIMEOUT_POLICY.SQL
@@ -1,4 +1,4 @@
-CREATE OR REPLACE SESSION POLICY session_timeout_policy
+CREATE OR REPLACE SESSION POLICY ${EXAMPLE_DB}.${MAIN_SCHEMA}.SESSION_TIMEOUT_POLICY
   SESSION_IDLE_TIMEOUT_MINS = 60
   SESSION_UI_IDLE_TIMEOUT_MINS = 15
   COMMENT = 'Session timeout policy for security';
diff --git a/src/main/java/com/snowflake/dlsync/ChangeManager.java b/src/main/java/com/snowflake/dlsync/ChangeManager.java
index e0cd743..33a7284 100644
--- a/src/main/java/com/snowflake/dlsync/ChangeManager.java
+++ b/src/main/java/com/snowflake/dlsync/ChangeManager.java
@@ -98,6 +98,7 @@ public void rollback() throws SQLException, IOException {
                 .stream()
                 .filter(script -> !config.isScriptExcluded(script))
                 .filter(script -> !script.getObjectType().isMigration())
+                .filter(script ->  scriptRepo.isScriptPreviouslyDeployed(script))
                 .filter(script -> scriptRepo.isScriptChanged(script))
                 .collect(Collectors.toList());
         dependencyGraph.addNodes(changedScripts);
diff --git a/src/main/java/com/snowflake/dlsync/dependency/DependencyGraph.java b/src/main/java/com/snowflake/dlsync/dependency/DependencyGraph.java
index 74e7e86..26fc397 100644
--- a/src/main/java/com/snowflake/dlsync/dependency/DependencyGraph.java
+++ b/src/main/java/com/snowflake/dlsync/dependency/DependencyGraph.java
@@ -108,12 +108,14 @@ public List<Script> getDependencyOverride(Script script, List<? extends Script>
                 .filter(dependencyOverride -> dependencyOverride.getScript().equals(script.getFullObjectName()))
                 .flatMap(dependencyOverride -> dependencyOverride.getDependencies().stream())
                 .map(dependencyName -> findScriptByName(nodes, dependencyName))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
                 .collect(Collectors.toList());
 
         return scriptsDependencyOverrides;
     }
 
-    private Script findScriptByName(List<? extends Script> allScripts, String fullObjectName) {
-        return allScripts.parallelStream().filter(script -> script.getFullObjectName().equals(fullObjectName)).findFirst().get();
+    private Optional<? extends Script> findScriptByName(List<? extends Script> allScripts, String fullObjectName) {
+        return allScripts.parallelStream().filter(script -> script.getFullObjectName().equals(fullObjectName)).findFirst();
     }
 }
diff --git a/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java b/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
index e848301..5cfcd8f 100644
--- a/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
+++ b/src/main/java/com/snowflake/dlsync/doa/ScriptRepo.java
@@ -185,6 +185,10 @@ private boolean insertScriptEvent(Script script, String status, String logs) thr
         return statement.executeUpdate() > 0;
     }
 
+    public boolean isScriptPreviouslyDeployed(Script script) {
+        return scriptHash.containsKey(script.getId());
+    }
+
     public boolean isScriptChanged(Script script) {
 //        return true;
         return !scriptHash.getOrDefault(script.getId(), "null").equals(script.getHash());
diff --git a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
index 375c04d..c5fc471 100644
--- a/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
+++ b/src/main/java/com/snowflake/dlsync/models/ScriptObjectType.java
@@ -14,9 +14,9 @@ public enum ScriptObjectType {
     NETWORK_RULES("NETWORK RULE", ObjectLevel.SCHEMA, false),
     RESOURCE_MONITORS("RESOURCE MONITOR", ObjectLevel.ACCOUNT, false),
     NETWORK_POLICIES("NETWORK POLICY", ObjectLevel.ACCOUNT, false),
-    SESSION_POLICIES("SESSION POLICY", ObjectLevel.ACCOUNT, false),
-    PASSWORD_POLICIES("PASSWORD POLICY", ObjectLevel.ACCOUNT, false),
-    AUTHENTICATION_POLICIES("AUTHENTICATION POLICY", ObjectLevel.ACCOUNT, false),
+    SESSION_POLICIES("SESSION POLICY", ObjectLevel.SCHEMA, false),
+    PASSWORD_POLICIES("PASSWORD POLICY", ObjectLevel.SCHEMA, false),
+    AUTHENTICATION_POLICIES("AUTHENTICATION POLICY", ObjectLevel.SCHEMA, false),
     API_INTEGRATIONS("API INTEGRATION", ObjectLevel.ACCOUNT, false),
     NOTIFICATION_INTEGRATIONS("NOTIFICATION INTEGRATION", ObjectLevel.ACCOUNT, false),
     SECURITY_INTEGRATIONS("SECURITY INTEGRATION", ObjectLevel.ACCOUNT, false),

From 50723ebd4d780675f6306fd1a01b967d5e9a174f Mon Sep 17 00:00:00 2001
From: Ytbarek Hailu <ytbarek.hailu@snowflake.com>
Date: Mon, 9 Feb 2026 21:18:27 -0800
Subject: [PATCH 10/11] updated version logback version

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8b95002..6d2ca55 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,8 +17,8 @@ dependencies {
 
     implementation 'org.apache.commons:commons-text:1.14.0'
     implementation 'net.snowflake:snowflake-jdbc:3.25.1'
-    implementation 'ch.qos.logback:logback-core:1.5.18'
-    implementation 'ch.qos.logback:logback-classic:1.5.18'
+    implementation 'ch.qos.logback:logback-core:1.5.25'
+    implementation 'ch.qos.logback:logback-classic:1.5.25'
     implementation 'org.slf4j:slf4j-api:2.0.4'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2'
     implementation 'commons-cli:commons-cli:1.9.0'

From 096b59b6b253945e8e43ea5e58ac3b8125055951 Mon Sep 17 00:00:00 2001
From: Ytbarek Hailu <ytbarek.hailu@snowflake.com>
Date: Tue, 10 Feb 2026 10:03:06 -0800
Subject: [PATCH 11/11] Updated changelog

---
 CHANGELOG.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6333cfc..a96fd5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,16 @@
 # DLSync Changelog
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## [3.1.0] - 2026-02-09
+## [3.1.0] - 2026-02-10
 ### Added
-- Added support for Snowflake Notebook object type
+- Added support for AGENTS object type
+- Added support for SEMANTIC_VIEWS object type
+- Added support for CORTEX_SEARCH_SERVICES object type
+- Added support for NOTEBOOKS object type
+### Fixed
+- Fixed rollback for undeployed declarative scripts
+- Moved SESSION_POLICIES, PASSWORD_POLICIES and AUTHENTICATION_POLICIES from account-level to schema-level objects
+- Fixed dependency override failure for unknown scripts not in the current changed scripts
 
 ## [3.0.1] - 2026-02-05
 ### Fixed