@catafal/notion-cli 5.9.0 → 5.9.1

package/oclif.manifest.json

@@ -2586,74 +2586,24 @@
         "update.js"
       ]
     },
-    "bookmark:list": {
+    "cache:info": {
       "aliases": [
-        "bm:ls"
+        "cache:stats",
+        "cache:status"
       ],
       "args": {},
-      "description": "List all saved bookmarks",
+      "description": "Show cache statistics and configuration",
       "examples": [
         {
-          "description": "List bookmarks",
-          "command": "$ notion-cli bookmark list"
+          "description": "Show cache info in JSON format",
+          "command": "notion-cli cache:info --json"
+        },
+        {
+          "description": "Show cache statistics",
+          "command": "notion-cli cache:info"
         }
       ],
       "flags": {
-        "columns": {
-          "description": "Only show provided columns (comma-separated)",
-          "exclusive": [
-            "extended"
-          ],
-          "name": "columns",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "sort": {
-          "description": "Property to sort by (prepend with - for descending)",
-          "name": "sort",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "filter": {
-          "description": "Filter property by substring match",
-          "name": "filter",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "csv": {
-          "description": "Output in CSV format",
-          "exclusive": [
-            "no-truncate"
-          ],
-          "name": "csv",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "extended": {
-          "char": "x",
-          "description": "Show extra columns",
-          "name": "extended",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "no-truncate": {
-          "description": "Do not truncate output to fit screen",
-          "exclusive": [
-            "csv"
-          ],
-          "name": "no-truncate",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "no-header": {
-          "description": "Hide table header from output",
-          "name": "no-header",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "json": {
           "char": "j",
           "description": "Output as JSON (recommended for automation)",
@@ -2706,7 +2656,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "bookmark:list",
+      "id": "cache:info",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -2716,139 +2666,105 @@
       "relativePath": [
         "dist",
         "commands",
-        "bookmark",
-        "list.js"
+        "cache",
+        "info.js"
       ]
     },
-    "bookmark:remove": {
+    "db:create": {
       "aliases": [
-        "bm:rm"
+        "db:c"
       ],
       "args": {
-        "name": {
-          "description": "Bookmark name to remove",
-          "name": "name",
+        "page_id": {
+          "description": "Parent page ID or URL where the database will be created",
+          "name": "page_id",
           "required": true
         }
       },
-      "description": "Remove a saved bookmark",
+      "description": "Create a database with an initial data source (table)",
       "examples": [
         {
-          "description": "Remove a bookmark",
-          "command": "$ notion-cli bookmark remove inbox"
+          "description": "Create a database with an initial data source",
+          "command": "$ notion-cli db create PAGE_ID -t 'My Database'"
+        },
+        {
+          "description": "Create a database using page URL",
+          "command": "$ notion-cli db create https://notion.so/PAGE_ID -t 'My Database'"
+        },
+        {
+          "description": "Create a database with an initial data source and output raw json",
+          "command": "$ notion-cli db create PAGE_ID -t 'My Database' -r"
         }
       ],
       "flags": {
-        "json": {
-          "char": "j",
-          "description": "Output as JSON (recommended for automation)",
-          "name": "json",
+        "title": {
+          "char": "t",
+          "description": "Title for the database (and initial data source)",
+          "name": "title",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "raw": {
+          "char": "r",
+          "description": "output raw json",
+          "name": "raw",
           "allowNo": false,
           "type": "boolean"
         },
-        "page-size": {
-          "description": "Items per page (1-100, default: 100 for automation)",
-          "name": "page-size",
-          "default": 100,
+        "columns": {
+          "description": "Only show provided columns (comma-separated)",
+          "exclusive": [
+            "extended"
+          ],
+          "name": "columns",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "retry": {
-          "description": "Auto-retry on rate limit (respects Retry-After header)",
-          "name": "retry",
-          "allowNo": false,
-          "type": "boolean"
+        "sort": {
+          "description": "Property to sort by (prepend with - for descending)",
+          "name": "sort",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
-        "timeout": {
-          "description": "Request timeout in milliseconds",
-          "name": "timeout",
-          "default": 30000,
+        "filter": {
+          "description": "Filter property by substring match",
+          "name": "filter",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "no-cache": {
-          "description": "Bypass cache and force fresh API calls",
-          "name": "no-cache",
+        "csv": {
+          "description": "Output in CSV format",
+          "exclusive": [
+            "no-truncate"
+          ],
+          "name": "csv",
           "allowNo": false,
           "type": "boolean"
         },
-        "verbose": {
-          "char": "v",
-          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
-          "env": "NOTION_CLI_VERBOSE",
-          "name": "verbose",
+        "extended": {
+          "char": "x",
+          "description": "Show extra columns",
+          "name": "extended",
           "allowNo": false,
           "type": "boolean"
         },
-        "minimal": {
-          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
-          "name": "minimal",
+        "no-truncate": {
+          "description": "Do not truncate output to fit screen",
+          "exclusive": [
+            "csv"
+          ],
+          "name": "no-truncate",
           "allowNo": false,
           "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "bookmark:remove",
-      "pluginAlias": "@catafal/notion-cli",
-      "pluginName": "@catafal/notion-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "bookmark",
-        "remove.js"
-      ]
-    },
-    "bookmark:set": {
-      "aliases": [
-        "bm:set"
-      ],
-      "args": {
-        "name": {
-          "description": "Bookmark name (e.g. \"inbox\", \"tasks\")",
-          "name": "name",
-          "required": true
-        },
-        "target": {
-          "description": "Notion ID, URL, or database name",
-          "name": "target",
-          "required": true
-        }
-      },
-      "description": "Save a named shortcut to a Notion page or database",
-      "examples": [
-        {
-          "description": "Bookmark a database as \"inbox\" and set it as default",
-          "command": "$ notion-cli bookmark set inbox DB_ID_OR_URL --default"
-        },
-        {
-          "description": "Bookmark a page",
-          "command": "$ notion-cli bookmark set notes PAGE_URL --type page"
-        }
-      ],
-      "flags": {
-        "type": {
-          "char": "t",
-          "description": "Resource type",
-          "name": "type",
-          "default": "database",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "database",
-            "page"
-          ],
-          "type": "option"
         },
-        "default": {
-          "description": "Also set as the default bookmark (used by `quick` command)",
-          "name": "default",
+        "no-header": {
+          "description": "Hide table header from output",
+          "name": "no-header",
           "allowNo": false,
           "type": "boolean"
         },
@@ -2904,7 +2820,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "bookmark:set",
+      "id": "db:create",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -2914,35 +2830,85 @@
       "relativePath": [
         "dist",
         "commands",
-        "bookmark",
-        "set.js"
+        "db",
+        "create.js"
       ]
     },
-    "cache:info": {
+    "db:query": {
       "aliases": [
-        "cache:stats",
-        "cache:status"
+        "db:q"
       ],
-      "args": {},
-      "description": "Show cache statistics and configuration",
-      "examples": [
-        {
-          "description": "Show cache info in JSON format",
-          "command": "notion-cli cache:info --json"
-        },
-        {
-          "description": "Show cache statistics",
-          "command": "notion-cli cache:info"
+      "args": {
+        "database_id": {
+          "description": "Database or data source ID or URL (required for automation)",
+          "name": "database_id",
+          "required": true
+        }
+      },
+      "description": "Query a database",
+      "examples": [
+        {
+          "description": "Query a database with full data (recommended for AI assistants)",
+          "command": "$ notion-cli db query DATABASE_ID --raw"
+        },
+        {
+          "description": "Query all records as JSON",
+          "command": "$ notion-cli db query DATABASE_ID --json"
+        },
+        {
+          "description": "Filter with JSON object (recommended for AI agents)",
+          "command": "$ notion-cli db query DATABASE_ID --filter '{\"property\": \"Status\", \"select\": {\"equals\": \"Done\"}}' --json"
+        },
+        {
+          "description": "Simple text search across properties",
+          "command": "$ notion-cli db query DATABASE_ID --search \"urgent\" --json"
+        },
+        {
+          "description": "Load complex filter from file",
+          "command": "$ notion-cli db query DATABASE_ID --file-filter ./filter.json --json"
+        },
+        {
+          "description": "Query with AND filter",
+          "command": "$ notion-cli db query DATABASE_ID --filter '{\"and\": [{\"property\": \"Status\", \"select\": {\"equals\": \"Done\"}}, {\"property\": \"Priority\", \"number\": {\"greater_than\": 5}}]}' --json"
+        },
+        {
+          "description": "Query using database URL",
+          "command": "$ notion-cli db query https://notion.so/DATABASE_ID --json"
+        },
+        {
+          "description": "Query with sorting",
+          "command": "$ notion-cli db query DATABASE_ID --sort-property Name --sort-direction desc"
+        },
+        {
+          "description": "Query with pagination",
+          "command": "$ notion-cli db query DATABASE_ID --page-size 50"
+        },
+        {
+          "description": "Get all pages (bypass pagination)",
+          "command": "$ notion-cli db query DATABASE_ID --page-all"
+        },
+        {
+          "description": "Output as CSV",
+          "command": "$ notion-cli db query DATABASE_ID --csv"
+        },
+        {
+          "description": "Output as markdown table",
+          "command": "$ notion-cli db query DATABASE_ID --markdown"
+        },
+        {
+          "description": "Output as compact JSON",
+          "command": "$ notion-cli db query DATABASE_ID --compact-json"
+        },
+        {
+          "description": "Output as pretty table",
+          "command": "$ notion-cli db query DATABASE_ID --pretty"
+        },
+        {
+          "description": "Select specific properties (60-80% token reduction)",
+          "command": "$ notion-cli db query DATABASE_ID --select \"title,status,priority\" --json"
         }
       ],
       "flags": {
-        "json": {
-          "char": "j",
-          "description": "Output as JSON (recommended for automation)",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "page-size": {
           "description": "Items per page (1-100, default: 100 for automation)",
           "name": "page-size",
@@ -2951,177 +2917,101 @@
           "multiple": false,
           "type": "option"
         },
-        "retry": {
-          "description": "Auto-retry on rate limit (respects Retry-After header)",
-          "name": "retry",
+        "page-all": {
+          "char": "A",
+          "description": "Get all pages (bypass pagination)",
+          "name": "page-all",
           "allowNo": false,
           "type": "boolean"
         },
-        "timeout": {
-          "description": "Request timeout in milliseconds",
-          "name": "timeout",
-          "default": 30000,
+        "sort-property": {
+          "description": "The property to sort results by",
+          "name": "sort-property",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "no-cache": {
-          "description": "Bypass cache and force fresh API calls",
-          "name": "no-cache",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
-          "env": "NOTION_CLI_VERBOSE",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "minimal": {
-          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
-          "name": "minimal",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "cache:info",
-      "pluginAlias": "@catafal/notion-cli",
-      "pluginName": "@catafal/notion-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "cache",
-        "info.js"
-      ]
-    },
-    "config:set-token": {
-      "aliases": [
-        "config:token"
-      ],
-      "args": {
-        "token": {
-          "description": "Notion integration token (starts with secret_ or ntn_)",
-          "name": "token",
-          "required": false
-        }
-      },
-      "description": "Set NOTION_TOKEN in your shell configuration file",
-      "examples": [
-        {
-          "description": "Set Notion token interactively",
-          "command": "notion-cli config set-token"
-        },
-        {
-          "description": "Set Notion token directly",
-          "command": "notion-cli config set-token ntn_abc123..."
+        "sort-direction": {
+          "description": "The direction to sort results",
+          "name": "sort-direction",
+          "default": "asc",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "asc",
+            "desc"
+          ],
+          "type": "option"
         },
-        {
-          "description": "Set token with JSON output",
-          "command": "notion-cli config set-token ntn_abc123... --json"
-        }
-      ],
-      "flags": {
-        "json": {
-          "char": "j",
-          "description": "Output as JSON (recommended for automation)",
-          "name": "json",
+        "raw": {
+          "char": "r",
+          "description": "Output raw JSON (recommended for AI assistants - returns all page data)",
+          "name": "raw",
           "allowNo": false,
           "type": "boolean"
         },
-        "page-size": {
-          "description": "Items per page (1-100, default: 100 for automation)",
-          "name": "page-size",
-          "default": 100,
+        "columns": {
+          "description": "Only show provided columns (comma-separated)",
+          "exclusive": [
+            "extended"
+          ],
+          "name": "columns",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "retry": {
-          "description": "Auto-retry on rate limit (respects Retry-After header)",
-          "name": "retry",
-          "allowNo": false,
-          "type": "boolean"
+        "sort": {
+          "description": "Property to sort by (prepend with - for descending)",
+          "name": "sort",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
-        "timeout": {
-          "description": "Request timeout in milliseconds",
-          "name": "timeout",
-          "default": 30000,
+        "filter": {
+          "char": "f",
+          "description": "Filter as JSON object (Notion filter API format)",
+          "exclusive": [
+            "search",
+            "file-filter",
+            "rawFilter",
+            "fileFilter"
+          ],
+          "name": "filter",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "no-cache": {
-          "description": "Bypass cache and force fresh API calls",
-          "name": "no-cache",
+        "csv": {
+          "description": "Output in CSV format",
+          "exclusive": [
+            "no-truncate"
+          ],
+          "name": "csv",
           "allowNo": false,
           "type": "boolean"
         },
-        "verbose": {
-          "char": "v",
-          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
-          "env": "NOTION_CLI_VERBOSE",
-          "name": "verbose",
+        "extended": {
+          "char": "x",
+          "description": "Show extra columns",
+          "name": "extended",
           "allowNo": false,
           "type": "boolean"
         },
-        "minimal": {
-          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
-          "name": "minimal",
+        "no-truncate": {
+          "description": "Do not truncate output to fit screen",
+          "exclusive": [
+            "csv"
+          ],
+          "name": "no-truncate",
           "allowNo": false,
           "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "config:set-token",
-      "pluginAlias": "@catafal/notion-cli",
-      "pluginName": "@catafal/notion-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "config",
-        "set-token.js"
-      ]
-    },
-    "daily": {
-      "aliases": [
-        "d"
-      ],
-      "args": {
-        "content": {
-          "description": "Text to add to today's entry (appended if entry already exists)",
-          "name": "content",
-          "required": false
-        }
-      },
-      "description": "Create or open today's daily journal entry",
-      "examples": [
-        {
-          "description": "Create today's entry",
-          "command": "$ notion-cli daily"
         },
-        {
-          "description": "Create entry with body content",
-          "command": "$ notion-cli daily \"Had a productive standup\""
+        "no-header": {
+          "description": "Hide table header from output",
+          "name": "no-header",
+          "allowNo": false,
+          "type": "boolean"
         },
-        {
-          "description": "First-time setup (see `daily setup --help`)",
-          "command": "$ notion-cli daily setup DB_ID"
-        }
-      ],
-      "flags": {
         "json": {
           "char": "j",
           "description": "Output as JSON (recommended for automation)",
@@ -3129,14 +3019,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "page-size": {
-          "description": "Items per page (1-100, default: 100 for automation)",
-          "name": "page-size",
-          "default": 100,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "retry": {
           "description": "Auto-retry on rate limit (respects Retry-After header)",
           "name": "retry",
@@ -3170,105 +3052,108 @@
           "name": "minimal",
           "allowNo": false,
           "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "daily",
-      "pluginAlias": "@catafal/notion-cli",
-      "pluginName": "@catafal/notion-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "daily",
-        "index.js"
-      ]
-    },
-    "daily:setup": {
-      "aliases": [],
-      "args": {
-        "target": {
-          "description": "Existing database ID or URL (manual mode)",
-          "name": "target",
-          "required": false
-        }
-      },
-      "description": "Configure the daily journal command",
-      "examples": [
-        {
-          "description": "Point to an existing database (manual)",
-          "command": "$ notion-cli daily setup DB_ID_OR_URL"
         },
-        {
-          "description": "Auto-create a daily journal database",
-          "command": "$ notion-cli daily setup --auto PAGE_ID_OR_URL"
-        }
-      ],
-      "flags": {
-        "auto": {
-          "description": "Auto-create database under this parent page (pass page ID or URL)",
-          "name": "auto",
+        "markdown": {
+          "char": "m",
+          "description": "Output as markdown table (GitHub-flavored)",
+          "exclusive": [
+            "compact-json",
+            "pretty"
+          ],
+          "name": "markdown",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "compact-json": {
+          "char": "c",
+          "description": "Output as compact JSON (single-line, ideal for piping)",
+          "exclusive": [
+            "markdown",
+            "pretty"
+          ],
+          "name": "compact-json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "pretty": {
+          "char": "P",
+          "description": "Output as pretty table with borders",
+          "exclusive": [
+            "markdown",
+            "compact-json"
+          ],
+          "name": "pretty",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "file-filter": {
+          "char": "F",
+          "description": "Load filter from JSON file",
+          "exclusive": [
+            "filter",
+            "search",
+            "rawFilter",
+            "fileFilter"
+          ],
+          "name": "file-filter",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "json": {
-          "char": "j",
-          "description": "Output as JSON (recommended for automation)",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
+        "search": {
+          "char": "s",
+          "description": "Simple text search (searches across title and common text properties)",
+          "exclusive": [
+            "filter",
+            "file-filter",
+            "rawFilter",
+            "fileFilter"
+          ],
+          "name": "search",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
-        "page-size": {
-          "description": "Items per page (1-100, default: 100 for automation)",
-          "name": "page-size",
-          "default": 100,
+        "select": {
+          "description": "Select specific properties to return (comma-separated). Reduces token usage by 60-80%.",
+          "name": "select",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "retry": {
-          "description": "Auto-retry on rate limit (respects Retry-After header)",
-          "name": "retry",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "timeout": {
-          "description": "Request timeout in milliseconds",
-          "name": "timeout",
-          "default": 30000,
+        "rawFilter": {
+          "char": "a",
+          "description": "DEPRECATED: Use --filter instead. JSON stringified filter string",
+          "exclusive": [
+            "filter",
+            "search",
+            "file-filter",
+            "fileFilter"
+          ],
+          "hidden": true,
+          "name": "rawFilter",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "no-cache": {
-          "description": "Bypass cache and force fresh API calls",
-          "name": "no-cache",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
-          "env": "NOTION_CLI_VERBOSE",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "minimal": {
-          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
-          "name": "minimal",
-          "allowNo": false,
-          "type": "boolean"
+        "fileFilter": {
+          "description": "DEPRECATED: Use --file-filter instead. JSON filter file path",
+          "exclusive": [
+            "filter",
+            "search",
+            "file-filter",
+            "rawFilter"
+          ],
+          "hidden": true,
+          "name": "fileFilter",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "daily:setup",
+      "id": "db:query",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -3278,49 +3163,50 @@
       "relativePath": [
         "dist",
         "commands",
-        "daily",
-        "setup.js"
+        "db",
+        "query.js"
       ]
     },
-    "db:create": {
+    "db:retrieve": {
       "aliases": [
-        "db:c"
+        "db:r",
+        "ds:retrieve",
+        "ds:r"
       ],
       "args": {
-        "page_id": {
-          "description": "Parent page ID or URL where the database will be created",
-          "name": "page_id",
+        "database_id": {
+          "description": "Data source ID or URL (the ID of the table whose schema you want to retrieve)",
+          "name": "database_id",
           "required": true
         }
       },
-      "description": "Create a database with an initial data source (table)",
+      "description": "Retrieve a data source (table) schema and properties",
       "examples": [
         {
-          "description": "Create a database with an initial data source",
-          "command": "$ notion-cli db create PAGE_ID -t 'My Database'"
+          "description": "Retrieve a data source with full schema (recommended for AI assistants)",
+          "command": "notion-cli db retrieve DATA_SOURCE_ID -r"
         },
         {
-          "description": "Create a database using page URL",
-          "command": "$ notion-cli db create https://notion.so/PAGE_ID -t 'My Database'"
+          "description": "Retrieve a data source schema via data_source_id",
+          "command": "notion-cli db retrieve DATA_SOURCE_ID"
         },
         {
-          "description": "Create a database with an initial data source and output raw json",
-          "command": "$ notion-cli db create PAGE_ID -t 'My Database' -r"
+          "description": "Retrieve a data source via URL",
+          "command": "notion-cli db retrieve https://notion.so/DATABASE_ID"
+        },
+        {
+          "description": "Retrieve a data source and output as markdown table",
+          "command": "notion-cli db retrieve DATA_SOURCE_ID --markdown"
+        },
+        {
+          "description": "Retrieve a data source and output as compact JSON",
+          "command": "notion-cli db retrieve DATA_SOURCE_ID --compact-json"
         }
       ],
       "flags": {
-        "title": {
-          "char": "t",
-          "description": "Title for the database (and initial data source)",
-          "name": "title",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "raw": {
           "char": "r",
-          "description": "output raw json",
+          "description": "output raw json (recommended for AI assistants - returns full schema)",
           "name": "raw",
           "allowNo": false,
           "type": "boolean"
@@ -3395,44 +3281,194 @@
           "multiple": false,
           "type": "option"
         },
-        "retry": {
-          "description": "Auto-retry on rate limit (respects Retry-After header)",
-          "name": "retry",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "timeout": {
-          "description": "Request timeout in milliseconds",
-          "name": "timeout",
-          "default": 30000,
+        "retry": {
+          "description": "Auto-retry on rate limit (respects Retry-After header)",
+          "name": "retry",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "timeout": {
+          "description": "Request timeout in milliseconds",
+          "name": "timeout",
+          "default": 30000,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "no-cache": {
+          "description": "Bypass cache and force fresh API calls",
+          "name": "no-cache",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
+          "env": "NOTION_CLI_VERBOSE",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "minimal": {
+          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
+          "name": "minimal",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "markdown": {
+          "char": "m",
+          "description": "Output as markdown table (GitHub-flavored)",
+          "exclusive": [
+            "compact-json",
+            "pretty"
+          ],
+          "name": "markdown",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "compact-json": {
+          "char": "c",
+          "description": "Output as compact JSON (single-line, ideal for piping)",
+          "exclusive": [
+            "markdown",
+            "pretty"
+          ],
+          "name": "compact-json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "pretty": {
+          "char": "P",
+          "description": "Output as pretty table with borders",
+          "exclusive": [
+            "markdown",
+            "compact-json"
+          ],
+          "name": "pretty",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "db:retrieve",
+      "pluginAlias": "@catafal/notion-cli",
+      "pluginName": "@catafal/notion-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "db",
+        "retrieve.js"
+      ]
+    },
+    "db:schema": {
+      "aliases": [
+        "db:s",
+        "ds:schema",
+        "ds:s"
+      ],
+      "args": {
+        "data_source_id": {
+          "description": "Data source ID or URL (the table whose schema you want to extract)",
+          "name": "data_source_id",
+          "required": true
+        }
+      },
+      "description": "Extract clean, AI-parseable schema from a Notion data source (table). This command is optimized for AI agents and automation - it returns property names, types, options (for select/multi-select), and configuration in an easy-to-parse format.",
+      "examples": [
+        {
+          "description": "Get full schema in JSON format (recommended for AI agents)",
+          "command": "<%= config.bin %> db schema abc123def456 --output json"
+        },
+        {
+          "description": "Get schema with property payload examples (recommended for AI agents)",
+          "command": "<%= config.bin %> db schema abc123def456 --with-examples --json"
+        },
+        {
+          "description": "Get schema using database URL",
+          "command": "<%= config.bin %> db schema https://notion.so/DATABASE_ID --output json"
+        },
+        {
+          "description": "Get schema as formatted table",
+          "command": "<%= config.bin %> db schema abc123def456"
+        },
+        {
+          "description": "Get schema with examples in human-readable format",
+          "command": "<%= config.bin %> db schema abc123def456 --with-examples"
+        },
+        {
+          "description": "Get schema in YAML format",
+          "command": "<%= config.bin %> db schema abc123def456 --output yaml"
+        },
+        {
+          "description": "Get only specific properties",
+          "command": "<%= config.bin %> db schema abc123def456 --properties Name,Status,Tags --output json"
+        },
+        {
+          "description": "Get schema as markdown documentation",
+          "command": "<%= config.bin %> db schema abc123def456 --markdown"
+        },
+        {
+          "description": "Parse schema with jq (extract property names)",
+          "command": "<%= config.bin %> db schema abc123def456 --output json | jq '.data.properties[].name'"
+        },
+        {
+          "description": "Find all select/multi-select properties and their options",
+          "command": "<%= config.bin %> db schema abc123def456 --output json | jq '.data.properties[] | select(.options) | {name, options}'"
+        }
+      ],
+      "flags": {
+        "output": {
+          "char": "o",
+          "description": "Output format",
+          "name": "output",
+          "default": "table",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "json",
+            "yaml",
+            "table"
+          ],
+          "type": "option"
+        },
+        "properties": {
+          "char": "p",
+          "description": "Comma-separated list of properties to include (default: all)",
+          "name": "properties",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "no-cache": {
-          "description": "Bypass cache and force fresh API calls",
-          "name": "no-cache",
+        "markdown": {
+          "char": "m",
+          "description": "Output as markdown documentation",
+          "name": "markdown",
           "allowNo": false,
           "type": "boolean"
         },
-        "verbose": {
-          "char": "v",
-          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
-          "env": "NOTION_CLI_VERBOSE",
-          "name": "verbose",
+        "json": {
+          "char": "j",
+          "description": "Output as JSON (shorthand for --output json)",
+          "name": "json",
           "allowNo": false,
           "type": "boolean"
         },
-        "minimal": {
-          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
-          "name": "minimal",
+        "with-examples": {
+          "char": "e",
+          "description": "Include property payload examples for create/update operations",
+          "name": "with-examples",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "db:create",
+      "id": "db:schema",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -3443,121 +3479,50 @@
         "dist",
         "commands",
         "db",
-        "create.js"
+        "schema.js"
       ]
     },
-    "db:query": {
+    "db:update": {
       "aliases": [
-        "db:q"
+        "db:u",
+        "ds:update",
+        "ds:u"
       ],
       "args": {
         "database_id": {
-          "description": "Database or data source ID or URL (required for automation)",
+          "description": "Data source ID or URL (the ID of the table you want to update)",
           "name": "database_id",
           "required": true
         }
       },
-      "description": "Query a database",
+      "description": "Update a data source (table) title and properties",
       "examples": [
         {
-          "description": "Query a database with full data (recommended for AI assistants)",
-          "command": "$ notion-cli db query DATABASE_ID --raw"
-        },
-        {
-          "description": "Query all records as JSON",
-          "command": "$ notion-cli db query DATABASE_ID --json"
-        },
-        {
-          "description": "Filter with JSON object (recommended for AI agents)",
-          "command": "$ notion-cli db query DATABASE_ID --filter '{\"property\": \"Status\", \"select\": {\"equals\": \"Done\"}}' --json"
-        },
-        {
-          "description": "Simple text search across properties",
-          "command": "$ notion-cli db query DATABASE_ID --search \"urgent\" --json"
-        },
-        {
-          "description": "Load complex filter from file",
-          "command": "$ notion-cli db query DATABASE_ID --file-filter ./filter.json --json"
-        },
-        {
-          "description": "Query with AND filter",
-          "command": "$ notion-cli db query DATABASE_ID --filter '{\"and\": [{\"property\": \"Status\", \"select\": {\"equals\": \"Done\"}}, {\"property\": \"Priority\", \"number\": {\"greater_than\": 5}}]}' --json"
-        },
-        {
-          "description": "Query using database URL",
-          "command": "$ notion-cli db query https://notion.so/DATABASE_ID --json"
-        },
-        {
-          "description": "Query with sorting",
-          "command": "$ notion-cli db query DATABASE_ID --sort-property Name --sort-direction desc"
-        },
-        {
-          "description": "Query with pagination",
-          "command": "$ notion-cli db query DATABASE_ID --page-size 50"
-        },
-        {
-          "description": "Get all pages (bypass pagination)",
-          "command": "$ notion-cli db query DATABASE_ID --page-all"
-        },
-        {
-          "description": "Output as CSV",
-          "command": "$ notion-cli db query DATABASE_ID --csv"
-        },
-        {
-          "description": "Output as markdown table",
-          "command": "$ notion-cli db query DATABASE_ID --markdown"
-        },
-        {
-          "description": "Output as compact JSON",
-          "command": "$ notion-cli db query DATABASE_ID --compact-json"
+          "description": "Update a data source with a specific data_source_id and title",
+          "command": "$ notion-cli db update DATA_SOURCE_ID -t 'My Data Source'"
         },
         {
-          "description": "Output as pretty table",
-          "command": "$ notion-cli db query DATABASE_ID --pretty"
+          "description": "Update a data source via URL",
+          "command": "$ notion-cli db update https://notion.so/DATABASE_ID -t 'My Data Source'"
         },
         {
-          "description": "Select specific properties (60-80% token reduction)",
-          "command": "$ notion-cli db query DATABASE_ID --select \"title,status,priority\" --json"
+          "description": "Update a data source with a specific data_source_id and output raw json",
+          "command": "$ notion-cli db update DATA_SOURCE_ID -t 'My Table' -r"
         }
       ],
       "flags": {
-        "page-size": {
-          "description": "Items per page (1-100, default: 100 for automation)",
-          "name": "page-size",
-          "default": 100,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "page-all": {
-          "char": "A",
-          "description": "Get all pages (bypass pagination)",
-          "name": "page-all",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "sort-property": {
-          "description": "The property to sort results by",
-          "name": "sort-property",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "sort-direction": {
-          "description": "The direction to sort results",
-          "name": "sort-direction",
-          "default": "asc",
+        "title": {
+          "char": "t",
+          "description": "New database title",
+          "name": "title",
+          "required": true,
           "hasDynamicHelp": false,
           "multiple": false,
-          "options": [
-            "asc",
-            "desc"
-          ],
           "type": "option"
         },
         "raw": {
           "char": "r",
-          "description": "Output raw JSON (recommended for AI assistants - returns all page data)",
+          "description": "output raw json",
           "name": "raw",
           "allowNo": false,
           "type": "boolean"
@@ -3580,14 +3545,7 @@
           "type": "option"
         },
         "filter": {
-          "char": "f",
-          "description": "Filter as JSON object (Notion filter API format)",
-          "exclusive": [
-            "search",
-            "file-filter",
-            "rawFilter",
-            "fileFilter"
-          ],
+          "description": "Filter property by substring match",
           "name": "filter",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -3631,141 +3589,52 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "retry": {
-          "description": "Auto-retry on rate limit (respects Retry-After header)",
-          "name": "retry",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "timeout": {
-          "description": "Request timeout in milliseconds",
-          "name": "timeout",
-          "default": 30000,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "no-cache": {
-          "description": "Bypass cache and force fresh API calls",
-          "name": "no-cache",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
-          "env": "NOTION_CLI_VERBOSE",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "minimal": {
-          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
-          "name": "minimal",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "markdown": {
-          "char": "m",
-          "description": "Output as markdown table (GitHub-flavored)",
-          "exclusive": [
-            "compact-json",
-            "pretty"
-          ],
-          "name": "markdown",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "compact-json": {
-          "char": "c",
-          "description": "Output as compact JSON (single-line, ideal for piping)",
-          "exclusive": [
-            "markdown",
-            "pretty"
-          ],
-          "name": "compact-json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "pretty": {
-          "char": "P",
-          "description": "Output as pretty table with borders",
-          "exclusive": [
-            "markdown",
-            "compact-json"
-          ],
-          "name": "pretty",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "file-filter": {
-          "char": "F",
-          "description": "Load filter from JSON file",
-          "exclusive": [
-            "filter",
-            "search",
-            "rawFilter",
-            "fileFilter"
-          ],
-          "name": "file-filter",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "search": {
-          "char": "s",
-          "description": "Simple text search (searches across title and common text properties)",
-          "exclusive": [
-            "filter",
-            "file-filter",
-            "rawFilter",
-            "fileFilter"
-          ],
-          "name": "search",
+        "page-size": {
+          "description": "Items per page (1-100, default: 100 for automation)",
+          "name": "page-size",
+          "default": 100,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "select": {
-          "description": "Select specific properties to return (comma-separated). Reduces token usage by 60-80%.",
-          "name": "select",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "retry": {
+          "description": "Auto-retry on rate limit (respects Retry-After header)",
+          "name": "retry",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "rawFilter": {
-          "char": "a",
-          "description": "DEPRECATED: Use --filter instead. JSON stringified filter string",
-          "exclusive": [
-            "filter",
-            "search",
-            "file-filter",
-            "fileFilter"
-          ],
-          "hidden": true,
-          "name": "rawFilter",
+        "timeout": {
+          "description": "Request timeout in milliseconds",
+          "name": "timeout",
+          "default": 30000,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "fileFilter": {
-          "description": "DEPRECATED: Use --file-filter instead. JSON filter file path",
-          "exclusive": [
-            "filter",
-            "search",
-            "file-filter",
-            "rawFilter"
-          ],
-          "hidden": true,
-          "name": "fileFilter",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "no-cache": {
+          "description": "Bypass cache and force fresh API calls",
+          "name": "no-cache",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
+          "env": "NOTION_CLI_VERBOSE",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "minimal": {
+          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
+          "name": "minimal",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "db:query",
+      "id": "db:update",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -3776,53 +3645,22 @@
         "dist",
         "commands",
         "db",
-        "query.js"
+        "update.js"
       ]
     },
-    "db:retrieve": {
+    "bookmark:list": {
       "aliases": [
-        "db:r",
-        "ds:retrieve",
-        "ds:r"
+        "bm:ls"
       ],
-      "args": {
-        "database_id": {
-          "description": "Data source ID or URL (the ID of the table whose schema you want to retrieve)",
-          "name": "database_id",
-          "required": true
-        }
-      },
-      "description": "Retrieve a data source (table) schema and properties",
+      "args": {},
+      "description": "List all saved bookmarks",
       "examples": [
         {
-          "description": "Retrieve a data source with full schema (recommended for AI assistants)",
-          "command": "notion-cli db retrieve DATA_SOURCE_ID -r"
-        },
-        {
-          "description": "Retrieve a data source schema via data_source_id",
-          "command": "notion-cli db retrieve DATA_SOURCE_ID"
-        },
-        {
-          "description": "Retrieve a data source via URL",
-          "command": "notion-cli db retrieve https://notion.so/DATABASE_ID"
-        },
-        {
-          "description": "Retrieve a data source and output as markdown table",
-          "command": "notion-cli db retrieve DATA_SOURCE_ID --markdown"
-        },
-        {
-          "description": "Retrieve a data source and output as compact JSON",
-          "command": "notion-cli db retrieve DATA_SOURCE_ID --compact-json"
+          "description": "List bookmarks",
+          "command": "$ notion-cli bookmark list"
         }
       ],
       "flags": {
-        "raw": {
-          "char": "r",
-          "description": "output raw json (recommended for AI assistants - returns full schema)",
-          "name": "raw",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "columns": {
           "description": "Only show provided columns (comma-separated)",
           "exclusive": [
@@ -3926,44 +3764,11 @@
           "name": "minimal",
           "allowNo": false,
           "type": "boolean"
-        },
-        "markdown": {
-          "char": "m",
-          "description": "Output as markdown table (GitHub-flavored)",
-          "exclusive": [
-            "compact-json",
-            "pretty"
-          ],
-          "name": "markdown",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "compact-json": {
-          "char": "c",
-          "description": "Output as compact JSON (single-line, ideal for piping)",
-          "exclusive": [
-            "markdown",
-            "pretty"
-          ],
-          "name": "compact-json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "pretty": {
-          "char": "P",
-          "description": "Output as pretty table with borders",
-          "exclusive": [
-            "markdown",
-            "compact-json"
-          ],
-          "name": "pretty",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "db:retrieve",
+      "id": "bookmark:list",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -3973,114 +3778,82 @@
       "relativePath": [
         "dist",
         "commands",
-        "db",
-        "retrieve.js"
+        "bookmark",
+        "list.js"
       ]
     },
-    "db:schema": {
+    "bookmark:remove": {
       "aliases": [
-        "db:s",
-        "ds:schema",
-        "ds:s"
+        "bm:rm"
       ],
       "args": {
-        "data_source_id": {
-          "description": "Data source ID or URL (the table whose schema you want to extract)",
-          "name": "data_source_id",
+        "name": {
+          "description": "Bookmark name to remove",
+          "name": "name",
           "required": true
         }
       },
-      "description": "Extract clean, AI-parseable schema from a Notion data source (table). This command is optimized for AI agents and automation - it returns property names, types, options (for select/multi-select), and configuration in an easy-to-parse format.",
+      "description": "Remove a saved bookmark",
       "examples": [
         {
-          "description": "Get full schema in JSON format (recommended for AI agents)",
-          "command": "<%= config.bin %> db schema abc123def456 --output json"
-        },
-        {
-          "description": "Get schema with property payload examples (recommended for AI agents)",
-          "command": "<%= config.bin %> db schema abc123def456 --with-examples --json"
-        },
-        {
-          "description": "Get schema using database URL",
-          "command": "<%= config.bin %> db schema https://notion.so/DATABASE_ID --output json"
-        },
-        {
-          "description": "Get schema as formatted table",
-          "command": "<%= config.bin %> db schema abc123def456"
-        },
-        {
-          "description": "Get schema with examples in human-readable format",
-          "command": "<%= config.bin %> db schema abc123def456 --with-examples"
-        },
-        {
-          "description": "Get schema in YAML format",
-          "command": "<%= config.bin %> db schema abc123def456 --output yaml"
-        },
-        {
-          "description": "Get only specific properties",
-          "command": "<%= config.bin %> db schema abc123def456 --properties Name,Status,Tags --output json"
-        },
-        {
-          "description": "Get schema as markdown documentation",
-          "command": "<%= config.bin %> db schema abc123def456 --markdown"
-        },
-        {
-          "description": "Parse schema with jq (extract property names)",
-          "command": "<%= config.bin %> db schema abc123def456 --output json | jq '.data.properties[].name'"
-        },
-        {
-          "description": "Find all select/multi-select properties and their options",
-          "command": "<%= config.bin %> db schema abc123def456 --output json | jq '.data.properties[] | select(.options) | {name, options}'"
+          "description": "Remove a bookmark",
+          "command": "$ notion-cli bookmark remove inbox"
         }
       ],
       "flags": {
-        "output": {
-          "char": "o",
-          "description": "Output format",
-          "name": "output",
-          "default": "table",
+        "json": {
+          "char": "j",
+          "description": "Output as JSON (recommended for automation)",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "page-size": {
+          "description": "Items per page (1-100, default: 100 for automation)",
+          "name": "page-size",
+          "default": 100,
           "hasDynamicHelp": false,
           "multiple": false,
-          "options": [
-            "json",
-            "yaml",
-            "table"
-          ],
           "type": "option"
         },
-        "properties": {
-          "char": "p",
-          "description": "Comma-separated list of properties to include (default: all)",
-          "name": "properties",
+        "retry": {
+          "description": "Auto-retry on rate limit (respects Retry-After header)",
+          "name": "retry",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "timeout": {
+          "description": "Request timeout in milliseconds",
+          "name": "timeout",
+          "default": 30000,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "markdown": {
-          "char": "m",
-          "description": "Output as markdown documentation",
-          "name": "markdown",
+        "no-cache": {
+          "description": "Bypass cache and force fresh API calls",
+          "name": "no-cache",
           "allowNo": false,
           "type": "boolean"
         },
-        "json": {
-          "char": "j",
-          "description": "Output as JSON (shorthand for --output json)",
-          "name": "json",
+        "verbose": {
+          "char": "v",
+          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
+          "env": "NOTION_CLI_VERBOSE",
+          "name": "verbose",
           "allowNo": false,
-          "type": "boolean"
-        },
-        "with-examples": {
-          "char": "e",
-          "description": "Include property payload examples for create/update operations",
-          "name": "with-examples",
+          "type": "boolean"
+        },
+        "minimal": {
+          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
+          "name": "minimal",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "db:schema",
+      "id": "bookmark:remove",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -4090,107 +3863,54 @@
       "relativePath": [
         "dist",
         "commands",
-        "db",
-        "schema.js"
+        "bookmark",
+        "remove.js"
       ]
     },
-    "db:update": {
+    "bookmark:set": {
       "aliases": [
-        "db:u",
-        "ds:update",
-        "ds:u"
+        "bm:set"
       ],
       "args": {
-        "database_id": {
-          "description": "Data source ID or URL (the ID of the table you want to update)",
-          "name": "database_id",
+        "name": {
+          "description": "Bookmark name (e.g. \"inbox\", \"tasks\")",
+          "name": "name",
+          "required": true
+        },
+        "target": {
+          "description": "Notion ID, URL, or database name",
+          "name": "target",
           "required": true
         }
       },
-      "description": "Update a data source (table) title and properties",
+      "description": "Save a named shortcut to a Notion page or database",
       "examples": [
         {
-          "description": "Update a data source with a specific data_source_id and title",
-          "command": "$ notion-cli db update DATA_SOURCE_ID -t 'My Data Source'"
-        },
-        {
-          "description": "Update a data source via URL",
-          "command": "$ notion-cli db update https://notion.so/DATABASE_ID -t 'My Data Source'"
+          "description": "Bookmark a database as \"inbox\" and set it as default",
+          "command": "$ notion-cli bookmark set inbox DB_ID_OR_URL --default"
         },
         {
-          "description": "Update a data source with a specific data_source_id and output raw json",
-          "command": "$ notion-cli db update DATA_SOURCE_ID -t 'My Table' -r"
+          "description": "Bookmark a page",
+          "command": "$ notion-cli bookmark set notes PAGE_URL --type page"
         }
       ],
       "flags": {
-        "title": {
+        "type": {
           "char": "t",
-          "description": "New database title",
-          "name": "title",
-          "required": true,
+          "description": "Resource type",
+          "name": "type",
+          "default": "database",
           "hasDynamicHelp": false,
           "multiple": false,
-          "type": "option"
-        },
-        "raw": {
-          "char": "r",
-          "description": "output raw json",
-          "name": "raw",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "columns": {
-          "description": "Only show provided columns (comma-separated)",
-          "exclusive": [
-            "extended"
+          "options": [
+            "database",
+            "page"
           ],
-          "name": "columns",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "sort": {
-          "description": "Property to sort by (prepend with - for descending)",
-          "name": "sort",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "filter": {
-          "description": "Filter property by substring match",
-          "name": "filter",
-          "hasDynamicHelp": false,
-          "multiple": false,
           "type": "option"
         },
-        "csv": {
-          "description": "Output in CSV format",
-          "exclusive": [
-            "no-truncate"
-          ],
-          "name": "csv",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "extended": {
-          "char": "x",
-          "description": "Show extra columns",
-          "name": "extended",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "no-truncate": {
-          "description": "Do not truncate output to fit screen",
-          "exclusive": [
-            "csv"
-          ],
-          "name": "no-truncate",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "no-header": {
-          "description": "Hide table header from output",
-          "name": "no-header",
+        "default": {
+          "description": "Also set as the default bookmark (used by `quick` command)",
+          "name": "default",
           "allowNo": false,
           "type": "boolean"
         },
@@ -4246,7 +3966,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "db:update",
+      "id": "bookmark:set",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -4256,93 +3976,130 @@
       "relativePath": [
         "dist",
         "commands",
-        "db",
-        "update.js"
+        "bookmark",
+        "set.js"
       ]
     },
-    "user:list": {
+    "config:set-token": {
       "aliases": [
-        "user:l"
+        "config:token"
       ],
-      "args": {},
-      "description": "List all users",
+      "args": {
+        "token": {
+          "description": "Notion integration token (starts with secret_ or ntn_)",
+          "name": "token",
+          "required": false
+        }
+      },
+      "description": "Set NOTION_TOKEN in your shell configuration file",
       "examples": [
         {
-          "description": "List all users",
-          "command": "$ notion-cli user list"
+          "description": "Set Notion token interactively",
+          "command": "notion-cli config set-token"
         },
         {
-          "description": "List all users and output raw json",
-          "command": "$ notion-cli user list -r"
+          "description": "Set Notion token directly",
+          "command": "notion-cli config set-token ntn_abc123..."
         },
         {
-          "description": "List all users and output JSON for automation",
-          "command": "$ notion-cli user list --json"
+          "description": "Set token with JSON output",
+          "command": "notion-cli config set-token ntn_abc123... --json"
         }
       ],
       "flags": {
-        "raw": {
-          "char": "r",
-          "description": "output raw json",
-          "name": "raw",
+        "json": {
+          "char": "j",
+          "description": "Output as JSON (recommended for automation)",
+          "name": "json",
           "allowNo": false,
           "type": "boolean"
         },
-        "columns": {
-          "description": "Only show provided columns (comma-separated)",
-          "exclusive": [
-            "extended"
-          ],
-          "name": "columns",
+        "page-size": {
+          "description": "Items per page (1-100, default: 100 for automation)",
+          "name": "page-size",
+          "default": 100,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "sort": {
-          "description": "Property to sort by (prepend with - for descending)",
-          "name": "sort",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "retry": {
+          "description": "Auto-retry on rate limit (respects Retry-After header)",
+          "name": "retry",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "filter": {
-          "description": "Filter property by substring match",
-          "name": "filter",
+        "timeout": {
+          "description": "Request timeout in milliseconds",
+          "name": "timeout",
+          "default": 30000,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "csv": {
-          "description": "Output in CSV format",
-          "exclusive": [
-            "no-truncate"
-          ],
-          "name": "csv",
+        "no-cache": {
+          "description": "Bypass cache and force fresh API calls",
+          "name": "no-cache",
           "allowNo": false,
           "type": "boolean"
         },
-        "extended": {
-          "char": "x",
-          "description": "Show extra columns",
-          "name": "extended",
+        "verbose": {
+          "char": "v",
+          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
+          "env": "NOTION_CLI_VERBOSE",
+          "name": "verbose",
           "allowNo": false,
           "type": "boolean"
         },
-        "no-truncate": {
-          "description": "Do not truncate output to fit screen",
-          "exclusive": [
-            "csv"
-          ],
-          "name": "no-truncate",
+        "minimal": {
+          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
+          "name": "minimal",
           "allowNo": false,
           "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "config:set-token",
+      "pluginAlias": "@catafal/notion-cli",
+      "pluginName": "@catafal/notion-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "config",
+        "set-token.js"
+      ]
+    },
+    "daily": {
+      "aliases": [
+        "d"
+      ],
+      "args": {
+        "content": {
+          "description": "Text to add to today's entry (appended if entry already exists)",
+          "name": "content",
+          "required": false
+        }
+      },
+      "description": "Create or open today's daily journal entry",
+      "examples": [
+        {
+          "description": "Create today's entry",
+          "command": "$ notion-cli daily"
         },
-        "no-header": {
-          "description": "Hide table header from output",
-          "name": "no-header",
-          "allowNo": false,
-          "type": "boolean"
+        {
+          "description": "Create entry with body content",
+          "command": "$ notion-cli daily \"Had a productive standup\""
         },
+        {
+          "description": "First-time setup (see `daily setup --help`)",
+          "command": "$ notion-cli daily setup DB_ID"
+        }
+      ],
+      "flags": {
         "json": {
           "char": "j",
           "description": "Output as JSON (recommended for automation)",
@@ -4395,7 +4152,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "user:list",
+      "id": "daily",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -4405,97 +4162,38 @@
       "relativePath": [
         "dist",
         "commands",
-        "user",
-        "list.js"
+        "daily",
+        "index.js"
       ]
     },
-    "user:retrieve": {
-      "aliases": [
-        "user:r"
-      ],
+    "daily:setup": {
+      "aliases": [],
       "args": {
-        "user_id": {
-          "name": "user_id"
+        "target": {
+          "description": "Existing database ID or URL (manual mode)",
+          "name": "target",
+          "required": false
         }
       },
-      "description": "Retrieve a user",
+      "description": "Configure the daily journal command",
       "examples": [
         {
-          "description": "Retrieve a user",
-          "command": "$ notion-cli user retrieve USER_ID"
-        },
-        {
-          "description": "Retrieve a user and output raw json",
-          "command": "$ notion-cli user retrieve USER_ID -r"
+          "description": "Point to an existing database (manual)",
+          "command": "$ notion-cli daily setup DB_ID_OR_URL"
         },
         {
-          "description": "Retrieve a user and output JSON for automation",
-          "command": "$ notion-cli user retrieve USER_ID --json"
+          "description": "Auto-create a daily journal database",
+          "command": "$ notion-cli daily setup --auto PAGE_ID_OR_URL"
         }
       ],
       "flags": {
-        "raw": {
-          "char": "r",
-          "description": "output raw json",
-          "name": "raw",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "columns": {
-          "description": "Only show provided columns (comma-separated)",
-          "exclusive": [
-            "extended"
-          ],
-          "name": "columns",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "sort": {
-          "description": "Property to sort by (prepend with - for descending)",
-          "name": "sort",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "filter": {
-          "description": "Filter property by substring match",
-          "name": "filter",
+        "auto": {
+          "description": "Auto-create database under this parent page (pass page ID or URL)",
+          "name": "auto",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "csv": {
-          "description": "Output in CSV format",
-          "exclusive": [
-            "no-truncate"
-          ],
-          "name": "csv",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "extended": {
-          "char": "x",
-          "description": "Show extra columns",
-          "name": "extended",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "no-truncate": {
-          "description": "Do not truncate output to fit screen",
-          "exclusive": [
-            "csv"
-          ],
-          "name": "no-truncate",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "no-header": {
-          "description": "Hide table header from output",
-          "name": "no-header",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "json": {
           "char": "j",
           "description": "Output as JSON (recommended for automation)",
@@ -4548,7 +4246,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "user:retrieve",
+      "id": "daily:setup",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -4558,29 +4256,171 @@
       "relativePath": [
         "dist",
         "commands",
-        "user",
-        "retrieve.js"
+        "daily",
+        "setup.js"
       ]
     },
-    "template:get": {
+    "page:create": {
       "aliases": [
-        "tpl:get"
+        "page:c"
       ],
-      "args": {
-        "name": {
-          "description": "Template name",
-          "name": "name",
-          "required": true
-        }
-      },
-      "description": "View a saved template",
+      "args": {},
+      "description": "Create a page",
       "examples": [
         {
-          "description": "View a template",
-          "command": "$ notion-cli template get \"meeting\""
+          "description": "Create a page via interactive mode",
+          "command": "$ notion-cli page create"
+        },
+        {
+          "description": "Create a page with a specific parent_page_id",
+          "command": "$ notion-cli page create -p PARENT_PAGE_ID"
+        },
+        {
+          "description": "Create a page with a parent page URL",
+          "command": "$ notion-cli page create -p https://notion.so/PARENT_PAGE_ID"
+        },
+        {
+          "description": "Create a page with a specific parent_db_id",
+          "command": "$ notion-cli page create -d PARENT_DB_ID"
+        },
+        {
+          "description": "Create a page with simple properties (recommended for AI agents)",
+          "command": "$ notion-cli page create -d DATA_SOURCE_ID -S --properties '{\"Name\": \"My Task\", \"Status\": \"In Progress\", \"Due Date\": \"2025-12-31\"}'"
+        },
+        {
+          "description": "Create a page with simple properties using relative dates",
+          "command": "$ notion-cli page create -d DATA_SOURCE_ID -S --properties '{\"Name\": \"Review\", \"Due Date\": \"tomorrow\", \"Priority\": \"High\"}'"
+        },
+        {
+          "description": "Create a page with simple properties and multi-select",
+          "command": "$ notion-cli page create -d DATA_SOURCE_ID -S --properties '{\"Name\": \"Bug Fix\", \"Tags\": [\"urgent\", \"bug\"], \"Status\": \"Done\"}'"
+        },
+        {
+          "description": "Create a page with a specific source markdown file and parent_page_id",
+          "command": "$ notion-cli page create -f ./path/to/source.md -p PARENT_PAGE_ID"
+        },
+        {
+          "description": "Create a page with a specific source markdown file and parent_db_id",
+          "command": "$ notion-cli page create -f ./path/to/source.md -d PARENT_DB_ID"
+        },
+        {
+          "description": "Create a page with a specific source markdown file and output raw json with parent_page_id",
+          "command": "$ notion-cli page create -f ./path/to/source.md -p PARENT_PAGE_ID -r"
+        },
+        {
+          "description": "Create a page and output JSON for automation",
+          "command": "$ notion-cli page create -p PARENT_PAGE_ID --json"
         }
       ],
       "flags": {
+        "parent_page_id": {
+          "char": "p",
+          "description": "Parent page ID or URL (to create a sub-page)",
+          "name": "parent_page_id",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "parent_data_source_id": {
+          "char": "d",
+          "description": "Parent data source ID or URL (to create a page in a table)",
+          "name": "parent_data_source_id",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "file_path": {
+          "char": "f",
+          "description": "Path to a source markdown file",
+          "name": "file_path",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "title_property": {
+          "char": "t",
+          "description": "Title property name (auto-detected: \"title\" for sub-pages, \"Name\" for databases)",
+          "name": "title_property",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "properties": {
+          "description": "Page properties as JSON string",
+          "name": "properties",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "simple-properties": {
+          "char": "S",
+          "description": "Use simplified property format (flat key-value pairs, recommended for AI agents)",
+          "name": "simple-properties",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "raw": {
+          "char": "r",
+          "description": "output raw json",
+          "name": "raw",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "columns": {
+          "description": "Only show provided columns (comma-separated)",
+          "exclusive": [
+            "extended"
+          ],
+          "name": "columns",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "sort": {
+          "description": "Property to sort by (prepend with - for descending)",
+          "name": "sort",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "filter": {
+          "description": "Filter property by substring match",
+          "name": "filter",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "csv": {
+          "description": "Output in CSV format",
+          "exclusive": [
+            "no-truncate"
+          ],
+          "name": "csv",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "extended": {
+          "char": "x",
+          "description": "Show extra columns",
+          "name": "extended",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "no-truncate": {
+          "description": "Do not truncate output to fit screen",
+          "exclusive": [
+            "csv"
+          ],
+          "name": "no-truncate",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "no-header": {
+          "description": "Hide table header from output",
+          "name": "no-header",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "json": {
           "char": "j",
           "description": "Output as JSON (recommended for automation)",
@@ -4633,7 +4473,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "template:get",
+      "id": "page:create",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -4643,23 +4483,44 @@
       "relativePath": [
         "dist",
         "commands",
-        "template",
-        "get.js"
+        "page",
+        "create.js"
       ]
     },
-    "template:list": {
+    "page:delete": {
       "aliases": [
-        "tpl:ls"
+        "page:d"
       ],
-      "args": {},
-      "description": "List all saved templates",
+      "args": {
+        "page_id": {
+          "description": "Page ID or full Notion URL",
+          "name": "page_id",
+          "required": true
+        }
+      },
+      "description": "Archive (soft-delete) a Notion page",
       "examples": [
         {
-          "description": "List all templates",
-          "command": "$ notion-cli template list"
+          "description": "Delete (archive) a page by ID",
+          "command": "$ notion-cli page delete PAGE_ID"
+        },
+        {
+          "description": "Delete (archive) a page by URL",
+          "command": "$ notion-cli page delete https://notion.so/PAGE_ID"
+        },
+        {
+          "description": "Delete and output JSON for automation",
+          "command": "$ notion-cli page delete PAGE_ID --json"
         }
       ],
       "flags": {
+        "raw": {
+          "char": "r",
+          "description": "Output raw JSON",
+          "name": "raw",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "columns": {
           "description": "Only show provided columns (comma-separated)",
           "exclusive": [
@@ -4767,7 +4628,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "template:list",
+      "id": "page:delete",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -4777,29 +4638,53 @@
       "relativePath": [
         "dist",
         "commands",
-        "template",
-        "list.js"
+        "page",
+        "delete.js"
       ]
     },
-    "template:remove": {
+    "page:export": {
       "aliases": [
-        "tpl:rm"
+        "page:e"
       ],
       "args": {
-        "name": {
-          "description": "Template name to remove",
-          "name": "name",
+        "page_id": {
+          "description": "Page ID or full Notion URL",
+          "name": "page_id",
           "required": true
         }
       },
-      "description": "Remove a saved template",
+      "description": "Export a Notion page to markdown or JSON",
       "examples": [
         {
-          "description": "Remove a template",
-          "command": "$ notion-cli template remove \"meeting\""
+          "description": "Export page as markdown to stdout",
+          "command": "$ notion-cli page export PAGE_ID"
+        },
+        {
+          "description": "Export page as markdown to a file",
+          "command": "$ notion-cli page export PAGE_ID -o notes.md"
+        },
+        {
+          "description": "Export page as JSON to a file",
+          "command": "$ notion-cli page export PAGE_ID --json -o page.json"
+        },
+        {
+          "description": "Export using a Notion URL",
+          "command": "$ notion-cli page export \"https://notion.so/My-Page-abc123\" -o notes.md"
+        },
+        {
+          "description": "Pipe markdown to another command",
+          "command": "$ notion-cli page export PAGE_ID | head -20"
         }
       ],
       "flags": {
+        "output": {
+          "char": "o",
+          "description": "File path to write (omit for stdout)",
+          "name": "output",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "json": {
           "char": "j",
           "description": "Output as JSON (recommended for automation)",
@@ -4852,7 +4737,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "template:remove",
+      "id": "page:export",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -4862,160 +4747,195 @@
       "relativePath": [
         "dist",
         "commands",
-        "template",
-        "remove.js"
+        "page",
+        "export.js"
       ]
     },
-    "template:save": {
+    "page:retrieve": {
       "aliases": [
-        "tpl:save"
+        "page:r"
       ],
       "args": {
-        "name": {
-          "description": "Template name (e.g. \"meeting\", \"task\")",
-          "name": "name",
+        "page_id": {
+          "description": "Page ID or full Notion URL (e.g., https://notion.so/...)",
+          "name": "page_id",
           "required": true
         }
       },
-      "description": "Save a reusable page template",
+      "description": "Retrieve a page",
       "examples": [
         {
-          "description": "Save a template with properties",
-          "command": "$ notion-cli template save \"meeting\" --properties '{\"Status\": \"To Do\", \"Type\": \"Meeting\"}'"
+          "description": "Retrieve a page with full data (recommended for AI assistants)",
+          "command": "$ notion-cli page retrieve PAGE_ID -r"
         },
         {
-          "description": "Save with properties, body content, and icon",
-          "command": "$ notion-cli template save \"standup\" --properties '{\"Status\": \"In Progress\"}' --content \"# Standup\\n\\n## Done\\n\\n## Doing\\n\\n## Blockers\" --icon \"🧑‍💻\""
+          "description": "Fast structure overview (90% faster than full fetch)",
+          "command": "$ notion-cli page retrieve PAGE_ID --map"
+        },
+        {
+          "description": "Fast structure overview with compact JSON",
+          "command": "$ notion-cli page retrieve PAGE_ID --map --compact-json"
+        },
+        {
+          "description": "Retrieve entire page tree with all nested content (35% token reduction)",
+          "command": "$ notion-cli page retrieve PAGE_ID --recursive --compact-json"
+        },
+        {
+          "description": "Retrieve page tree with custom depth limit",
+          "command": "$ notion-cli page retrieve PAGE_ID -R --max-depth 5 --json"
+        },
+        {
+          "description": "Retrieve a page and output table",
+          "command": "$ notion-cli page retrieve PAGE_ID"
+        },
+        {
+          "description": "Retrieve a page via URL",
+          "command": "$ notion-cli page retrieve https://notion.so/PAGE_ID"
+        },
+        {
+          "description": "Retrieve a page and output raw json",
+          "command": "$ notion-cli page retrieve PAGE_ID -r"
+        },
+        {
+          "description": "Retrieve a page and output markdown",
+          "command": "$ notion-cli page retrieve PAGE_ID -m"
+        },
+        {
+          "description": "Retrieve a page metadata and output as markdown table",
+          "command": "$ notion-cli page retrieve PAGE_ID --markdown"
+        },
+        {
+          "description": "Retrieve a page metadata and output as compact JSON",
+          "command": "$ notion-cli page retrieve PAGE_ID --compact-json"
+        },
+        {
+          "description": "Retrieve a page and output JSON for automation",
+          "command": "$ notion-cli page retrieve PAGE_ID --json"
         }
       ],
       "flags": {
-        "properties": {
-          "char": "p",
-          "description": "Properties as JSON (simple format, e.g. '{\"Status\": \"To Do\"}')",
-          "name": "properties",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "raw": {
+          "char": "r",
+          "description": "output raw json (recommended for AI assistants - returns all fields)",
+          "name": "raw",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "content": {
-          "char": "c",
-          "description": "Markdown body content for the page",
-          "name": "content",
+        "markdown": {
+          "char": "m",
+          "description": "Output as markdown table (GitHub-flavored)",
+          "exclusive": [
+            "compact-json",
+            "pretty"
+          ],
+          "name": "markdown",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "map": {
+          "description": "fast structure discovery (returns minimal info: titles, types, IDs)",
+          "exclusive": [
+            "raw",
+            "markdown"
+          ],
+          "name": "map",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "recursive": {
+          "char": "R",
+          "description": "recursively fetch all blocks and nested pages (reduces API calls)",
+          "name": "recursive",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "max-depth": {
+          "dependsOn": [
+            "recursive"
+          ],
+          "description": "maximum recursion depth for --recursive (default: 3)",
+          "name": "max-depth",
+          "default": 3,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "icon": {
-          "description": "Emoji icon (e.g. \"📋\")",
-          "name": "icon",
+        "columns": {
+          "description": "Only show provided columns (comma-separated)",
+          "exclusive": [
+            "extended"
+          ],
+          "name": "columns",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "json": {
-          "char": "j",
-          "description": "Output as JSON (recommended for automation)",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "page-size": {
-          "description": "Items per page (1-100, default: 100 for automation)",
-          "name": "page-size",
-          "default": 100,
+        "sort": {
+          "description": "Property to sort by (prepend with - for descending)",
+          "name": "sort",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "retry": {
-          "description": "Auto-retry on rate limit (respects Retry-After header)",
-          "name": "retry",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "timeout": {
-          "description": "Request timeout in milliseconds",
-          "name": "timeout",
-          "default": 30000,
+        "filter": {
+          "description": "Filter property by substring match",
+          "name": "filter",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "no-cache": {
-          "description": "Bypass cache and force fresh API calls",
-          "name": "no-cache",
+        "csv": {
+          "description": "Output in CSV format",
+          "exclusive": [
+            "no-truncate"
+          ],
+          "name": "csv",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "extended": {
+          "char": "x",
+          "description": "Show extra columns",
+          "name": "extended",
           "allowNo": false,
           "type": "boolean"
         },
-        "verbose": {
-          "char": "v",
-          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
-          "env": "NOTION_CLI_VERBOSE",
-          "name": "verbose",
+        "no-truncate": {
+          "description": "Do not truncate output to fit screen",
+          "exclusive": [
+            "csv"
+          ],
+          "name": "no-truncate",
           "allowNo": false,
           "type": "boolean"
         },
-        "minimal": {
-          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
-          "name": "minimal",
+        "no-header": {
+          "description": "Hide table header from output",
+          "name": "no-header",
           "allowNo": false,
           "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "template:save",
-      "pluginAlias": "@catafal/notion-cli",
-      "pluginName": "@catafal/notion-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "template",
-        "save.js"
-      ]
-    },
-    "template:use": {
-      "aliases": [
-        "tpl:use"
-      ],
-      "args": {
-        "name": {
-          "description": "Template name to use",
-          "name": "name",
-          "required": true
-        }
-      },
-      "description": "Create a page from a saved template",
-      "examples": [
-        {
-          "description": "Create a page from a template",
-          "command": "$ notion-cli template use \"meeting\" --to tasks --title \"Sprint Planning\""
         },
-        {
-          "description": "Use default bookmark as target",
-          "command": "$ notion-cli template use \"task\" --title \"Fix login bug\""
-        }
-      ],
-      "flags": {
-        "to": {
-          "description": "Target bookmark name, database name, or ID (defaults to default bookmark)",
-          "name": "to",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "compact-json": {
+          "char": "c",
+          "description": "Output as compact JSON (single-line, ideal for piping)",
+          "exclusive": [
+            "markdown",
+            "pretty"
+          ],
+          "name": "compact-json",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "title": {
-          "char": "t",
-          "description": "Page title (overrides any title in template properties)",
-          "name": "title",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "pretty": {
+          "char": "P",
+          "description": "Output as pretty table with borders",
+          "exclusive": [
+            "markdown",
+            "compact-json"
+          ],
+          "name": "pretty",
+          "allowNo": false,
+          "type": "boolean"
         },
         "json": {
           "char": "j",
@@ -5069,7 +4989,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "template:use",
+      "id": "page:retrieve",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -5079,97 +4999,85 @@
       "relativePath": [
         "dist",
         "commands",
-        "template",
-        "use.js"
+        "page",
+        "retrieve.js"
       ]
     },
-    "page:create": {
+    "page:update": {
       "aliases": [
-        "page:c"
+        "page:u"
       ],
-      "args": {},
-      "description": "Create a page",
+      "args": {
+        "page_id": {
+          "description": "Page ID or full Notion URL (e.g., https://notion.so/...)",
+          "name": "page_id",
+          "required": true
+        }
+      },
+      "description": "Update a page",
       "examples": [
         {
-          "description": "Create a page via interactive mode",
-          "command": "$ notion-cli page create"
+          "description": "Update a page and output table",
+          "command": "$ notion-cli page update PAGE_ID"
         },
         {
-          "description": "Create a page with a specific parent_page_id",
-          "command": "$ notion-cli page create -p PARENT_PAGE_ID"
+          "description": "Update a page via URL",
+          "command": "$ notion-cli page update https://notion.so/PAGE_ID -a"
         },
         {
-          "description": "Create a page with a parent page URL",
-          "command": "$ notion-cli page create -p https://notion.so/PARENT_PAGE_ID"
+          "description": "Update page properties with simple format (recommended for AI agents)",
+          "command": "$ notion-cli page update PAGE_ID -S --properties '{\"Status\": \"Done\", \"Priority\": \"High\"}'"
         },
         {
-          "description": "Create a page with a specific parent_db_id",
-          "command": "$ notion-cli page create -d PARENT_DB_ID"
+          "description": "Update page properties with relative date",
+          "command": "$ notion-cli page update PAGE_ID -S --properties '{\"Due Date\": \"tomorrow\", \"Status\": \"In Progress\"}'"
         },
         {
-          "description": "Create a page with simple properties (recommended for AI agents)",
-          "command": "$ notion-cli page create -d DATA_SOURCE_ID -S --properties '{\"Name\": \"My Task\", \"Status\": \"In Progress\", \"Due Date\": \"2025-12-31\"}'"
+          "description": "Update page with multi-select tags",
+          "command": "$ notion-cli page update PAGE_ID -S --properties '{\"Tags\": [\"urgent\", \"bug\"], \"Status\": \"Done\"}'"
         },
         {
-          "description": "Create a page with simple properties using relative dates",
-          "command": "$ notion-cli page create -d DATA_SOURCE_ID -S --properties '{\"Name\": \"Review\", \"Due Date\": \"tomorrow\", \"Priority\": \"High\"}'"
+          "description": "Update a page and output raw json",
+          "command": "$ notion-cli page update PAGE_ID -r"
         },
         {
-          "description": "Create a page with simple properties and multi-select",
-          "command": "$ notion-cli page create -d DATA_SOURCE_ID -S --properties '{\"Name\": \"Bug Fix\", \"Tags\": [\"urgent\", \"bug\"], \"Status\": \"Done\"}'"
+          "description": "Update a page and archive",
+          "command": "$ notion-cli page update PAGE_ID -a"
         },
         {
-          "description": "Create a page with a specific source markdown file and parent_page_id",
-          "command": "$ notion-cli page create -f ./path/to/source.md -p PARENT_PAGE_ID"
+          "description": "Update a page and unarchive",
+          "command": "$ notion-cli page update PAGE_ID -u"
         },
         {
-          "description": "Create a page with a specific source markdown file and parent_db_id",
-          "command": "$ notion-cli page create -f ./path/to/source.md -d PARENT_DB_ID"
+          "description": "Update a page and archive and output raw json",
+          "command": "$ notion-cli page update PAGE_ID -a -r"
         },
         {
-          "description": "Create a page with a specific source markdown file and output raw json with parent_page_id",
-          "command": "$ notion-cli page create -f ./path/to/source.md -p PARENT_PAGE_ID -r"
+          "description": "Update a page and unarchive and output raw json",
+          "command": "$ notion-cli page update PAGE_ID -u -r"
         },
         {
-          "description": "Create a page and output JSON for automation",
-          "command": "$ notion-cli page create -p PARENT_PAGE_ID --json"
+          "description": "Update a page and output JSON for automation",
+          "command": "$ notion-cli page update PAGE_ID -a --json"
         }
       ],
       "flags": {
-        "parent_page_id": {
-          "char": "p",
-          "description": "Parent page ID or URL (to create a sub-page)",
-          "name": "parent_page_id",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "parent_data_source_id": {
-          "char": "d",
-          "description": "Parent data source ID or URL (to create a page in a table)",
-          "name": "parent_data_source_id",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "file_path": {
-          "char": "f",
-          "description": "Path to a source markdown file",
-          "name": "file_path",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "archived": {
+          "char": "a",
+          "description": "Archive the page",
+          "name": "archived",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "title_property": {
-          "char": "t",
-          "description": "Title property name (auto-detected: \"title\" for sub-pages, \"Name\" for databases)",
-          "name": "title_property",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "unarchive": {
+          "char": "u",
+          "description": "Unarchive the page",
+          "name": "unarchive",
+          "allowNo": false,
+          "type": "boolean"
         },
         "properties": {
-          "description": "Page properties as JSON string",
+          "description": "Page properties to update as JSON string",
           "name": "properties",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -5229,21 +5137,106 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "no-truncate": {
-          "description": "Do not truncate output to fit screen",
-          "exclusive": [
-            "csv"
-          ],
-          "name": "no-truncate",
+        "no-truncate": {
+          "description": "Do not truncate output to fit screen",
+          "exclusive": [
+            "csv"
+          ],
+          "name": "no-truncate",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "no-header": {
+          "description": "Hide table header from output",
+          "name": "no-header",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "json": {
+          "char": "j",
+          "description": "Output as JSON (recommended for automation)",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "page-size": {
+          "description": "Items per page (1-100, default: 100 for automation)",
+          "name": "page-size",
+          "default": 100,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "retry": {
+          "description": "Auto-retry on rate limit (respects Retry-After header)",
+          "name": "retry",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "timeout": {
+          "description": "Request timeout in milliseconds",
+          "name": "timeout",
+          "default": 30000,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "no-cache": {
+          "description": "Bypass cache and force fresh API calls",
+          "name": "no-cache",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
+          "env": "NOTION_CLI_VERBOSE",
+          "name": "verbose",
           "allowNo": false,
           "type": "boolean"
         },
-        "no-header": {
-          "description": "Hide table header from output",
-          "name": "no-header",
+        "minimal": {
+          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
+          "name": "minimal",
           "allowNo": false,
           "type": "boolean"
-        },
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "page:update",
+      "pluginAlias": "@catafal/notion-cli",
+      "pluginName": "@catafal/notion-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "page",
+        "update.js"
+      ]
+    },
+    "template:get": {
+      "aliases": [
+        "tpl:get"
+      ],
+      "args": {
+        "name": {
+          "description": "Template name",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "View a saved template",
+      "examples": [
+        {
+          "description": "View a template",
+          "command": "$ notion-cli template get \"meeting\""
+        }
+      ],
+      "flags": {
         "json": {
           "char": "j",
           "description": "Output as JSON (recommended for automation)",
@@ -5296,7 +5289,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "page:create",
+      "id": "template:get",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -5306,44 +5299,23 @@
       "relativePath": [
         "dist",
         "commands",
-        "page",
-        "create.js"
+        "template",
+        "get.js"
       ]
     },
-    "page:delete": {
+    "template:list": {
       "aliases": [
-        "page:d"
+        "tpl:ls"
       ],
-      "args": {
-        "page_id": {
-          "description": "Page ID or full Notion URL",
-          "name": "page_id",
-          "required": true
-        }
-      },
-      "description": "Archive (soft-delete) a Notion page",
+      "args": {},
+      "description": "List all saved templates",
       "examples": [
         {
-          "description": "Delete (archive) a page by ID",
-          "command": "$ notion-cli page delete PAGE_ID"
-        },
-        {
-          "description": "Delete (archive) a page by URL",
-          "command": "$ notion-cli page delete https://notion.so/PAGE_ID"
-        },
-        {
-          "description": "Delete and output JSON for automation",
-          "command": "$ notion-cli page delete PAGE_ID --json"
+          "description": "List all templates",
+          "command": "$ notion-cli template list"
         }
       ],
       "flags": {
-        "raw": {
-          "char": "r",
-          "description": "Output raw JSON",
-          "name": "raw",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "columns": {
           "description": "Only show provided columns (comma-separated)",
           "exclusive": [
@@ -5451,7 +5423,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "page:delete",
+      "id": "template:list",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -5461,53 +5433,29 @@
       "relativePath": [
         "dist",
         "commands",
-        "page",
-        "delete.js"
+        "template",
+        "list.js"
       ]
     },
-    "page:export": {
+    "template:remove": {
       "aliases": [
-        "page:e"
+        "tpl:rm"
       ],
       "args": {
-        "page_id": {
-          "description": "Page ID or full Notion URL",
-          "name": "page_id",
+        "name": {
+          "description": "Template name to remove",
+          "name": "name",
           "required": true
         }
       },
-      "description": "Export a Notion page to markdown or JSON",
+      "description": "Remove a saved template",
       "examples": [
         {
-          "description": "Export page as markdown to stdout",
-          "command": "$ notion-cli page export PAGE_ID"
-        },
-        {
-          "description": "Export page as markdown to a file",
-          "command": "$ notion-cli page export PAGE_ID -o notes.md"
-        },
-        {
-          "description": "Export page as JSON to a file",
-          "command": "$ notion-cli page export PAGE_ID --json -o page.json"
-        },
-        {
-          "description": "Export using a Notion URL",
-          "command": "$ notion-cli page export \"https://notion.so/My-Page-abc123\" -o notes.md"
-        },
-        {
-          "description": "Pipe markdown to another command",
-          "command": "$ notion-cli page export PAGE_ID | head -20"
+          "description": "Remove a template",
+          "command": "$ notion-cli template remove \"meeting\""
         }
       ],
       "flags": {
-        "output": {
-          "char": "o",
-          "description": "File path to write (omit for stdout)",
-          "name": "output",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "json": {
           "char": "j",
           "description": "Output as JSON (recommended for automation)",
@@ -5560,7 +5508,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "page:export",
+      "id": "template:remove",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -5570,196 +5518,56 @@
       "relativePath": [
         "dist",
         "commands",
-        "page",
-        "export.js"
+        "template",
+        "remove.js"
       ]
     },
-    "page:retrieve": {
+    "template:save": {
       "aliases": [
-        "page:r"
-      ],
-      "args": {
-        "page_id": {
-          "description": "Page ID or full Notion URL (e.g., https://notion.so/...)",
-          "name": "page_id",
-          "required": true
-        }
-      },
-      "description": "Retrieve a page",
-      "examples": [
-        {
-          "description": "Retrieve a page with full data (recommended for AI assistants)",
-          "command": "$ notion-cli page retrieve PAGE_ID -r"
-        },
-        {
-          "description": "Fast structure overview (90% faster than full fetch)",
-          "command": "$ notion-cli page retrieve PAGE_ID --map"
-        },
-        {
-          "description": "Fast structure overview with compact JSON",
-          "command": "$ notion-cli page retrieve PAGE_ID --map --compact-json"
-        },
-        {
-          "description": "Retrieve entire page tree with all nested content (35% token reduction)",
-          "command": "$ notion-cli page retrieve PAGE_ID --recursive --compact-json"
-        },
-        {
-          "description": "Retrieve page tree with custom depth limit",
-          "command": "$ notion-cli page retrieve PAGE_ID -R --max-depth 5 --json"
-        },
-        {
-          "description": "Retrieve a page and output table",
-          "command": "$ notion-cli page retrieve PAGE_ID"
-        },
-        {
-          "description": "Retrieve a page via URL",
-          "command": "$ notion-cli page retrieve https://notion.so/PAGE_ID"
-        },
-        {
-          "description": "Retrieve a page and output raw json",
-          "command": "$ notion-cli page retrieve PAGE_ID -r"
-        },
-        {
-          "description": "Retrieve a page and output markdown",
-          "command": "$ notion-cli page retrieve PAGE_ID -m"
-        },
-        {
-          "description": "Retrieve a page metadata and output as markdown table",
-          "command": "$ notion-cli page retrieve PAGE_ID --markdown"
-        },
-        {
-          "description": "Retrieve a page metadata and output as compact JSON",
-          "command": "$ notion-cli page retrieve PAGE_ID --compact-json"
-        },
-        {
-          "description": "Retrieve a page and output JSON for automation",
-          "command": "$ notion-cli page retrieve PAGE_ID --json"
-        }
-      ],
-      "flags": {
-        "raw": {
-          "char": "r",
-          "description": "output raw json (recommended for AI assistants - returns all fields)",
-          "name": "raw",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "markdown": {
-          "char": "m",
-          "description": "Output as markdown table (GitHub-flavored)",
-          "exclusive": [
-            "compact-json",
-            "pretty"
-          ],
-          "name": "markdown",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "map": {
-          "description": "fast structure discovery (returns minimal info: titles, types, IDs)",
-          "exclusive": [
-            "raw",
-            "markdown"
-          ],
-          "name": "map",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "recursive": {
-          "char": "R",
-          "description": "recursively fetch all blocks and nested pages (reduces API calls)",
-          "name": "recursive",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "max-depth": {
-          "dependsOn": [
-            "recursive"
-          ],
-          "description": "maximum recursion depth for --recursive (default: 3)",
-          "name": "max-depth",
-          "default": 3,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "tpl:save"
+      ],
+      "args": {
+        "name": {
+          "description": "Template name (e.g. \"meeting\", \"task\")",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "Save a reusable page template",
+      "examples": [
+        {
+          "description": "Save a template with properties",
+          "command": "$ notion-cli template save \"meeting\" --properties '{\"Status\": \"To Do\", \"Type\": \"Meeting\"}'"
         },
-        "columns": {
-          "description": "Only show provided columns (comma-separated)",
-          "exclusive": [
-            "extended"
-          ],
-          "name": "columns",
+        {
+          "description": "Save with properties, body content, and icon",
+          "command": "$ notion-cli template save \"standup\" --properties '{\"Status\": \"In Progress\"}' --content \"# Standup\\n\\n## Done\\n\\n## Doing\\n\\n## Blockers\" --icon \"🧑‍💻\""
+        }
+      ],
+      "flags": {
+        "properties": {
+          "char": "p",
+          "description": "Properties as JSON (simple format, e.g. '{\"Status\": \"To Do\"}')",
+          "name": "properties",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "sort": {
-          "description": "Property to sort by (prepend with - for descending)",
-          "name": "sort",
+        "content": {
+          "char": "c",
+          "description": "Markdown body content for the page",
+          "name": "content",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "filter": {
-          "description": "Filter property by substring match",
-          "name": "filter",
+        "icon": {
+          "description": "Emoji icon (e.g. \"📋\")",
+          "name": "icon",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "csv": {
-          "description": "Output in CSV format",
-          "exclusive": [
-            "no-truncate"
-          ],
-          "name": "csv",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "extended": {
-          "char": "x",
-          "description": "Show extra columns",
-          "name": "extended",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "no-truncate": {
-          "description": "Do not truncate output to fit screen",
-          "exclusive": [
-            "csv"
-          ],
-          "name": "no-truncate",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "no-header": {
-          "description": "Hide table header from output",
-          "name": "no-header",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "compact-json": {
-          "char": "c",
-          "description": "Output as compact JSON (single-line, ideal for piping)",
-          "exclusive": [
-            "markdown",
-            "pretty"
-          ],
-          "name": "compact-json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "pretty": {
-          "char": "P",
-          "description": "Output as pretty table with borders",
-          "exclusive": [
-            "markdown",
-            "compact-json"
-          ],
-          "name": "pretty",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "json": {
           "char": "j",
           "description": "Output as JSON (recommended for automation)",
@@ -5812,7 +5620,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "page:retrieve",
+      "id": "template:save",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -5822,97 +5630,136 @@
       "relativePath": [
         "dist",
         "commands",
-        "page",
-        "retrieve.js"
+        "template",
+        "save.js"
       ]
     },
-    "page:update": {
+    "template:use": {
       "aliases": [
-        "page:u"
+        "tpl:use"
       ],
       "args": {
-        "page_id": {
-          "description": "Page ID or full Notion URL (e.g., https://notion.so/...)",
-          "name": "page_id",
+        "name": {
+          "description": "Template name to use",
+          "name": "name",
           "required": true
         }
       },
-      "description": "Update a page",
+      "description": "Create a page from a saved template",
       "examples": [
         {
-          "description": "Update a page and output table",
-          "command": "$ notion-cli page update PAGE_ID"
-        },
-        {
-          "description": "Update a page via URL",
-          "command": "$ notion-cli page update https://notion.so/PAGE_ID -a"
-        },
-        {
-          "description": "Update page properties with simple format (recommended for AI agents)",
-          "command": "$ notion-cli page update PAGE_ID -S --properties '{\"Status\": \"Done\", \"Priority\": \"High\"}'"
-        },
-        {
-          "description": "Update page properties with relative date",
-          "command": "$ notion-cli page update PAGE_ID -S --properties '{\"Due Date\": \"tomorrow\", \"Status\": \"In Progress\"}'"
-        },
-        {
-          "description": "Update page with multi-select tags",
-          "command": "$ notion-cli page update PAGE_ID -S --properties '{\"Tags\": [\"urgent\", \"bug\"], \"Status\": \"Done\"}'"
-        },
-        {
-          "description": "Update a page and output raw json",
-          "command": "$ notion-cli page update PAGE_ID -r"
-        },
-        {
-          "description": "Update a page and archive",
-          "command": "$ notion-cli page update PAGE_ID -a"
-        },
-        {
-          "description": "Update a page and unarchive",
-          "command": "$ notion-cli page update PAGE_ID -u"
-        },
-        {
-          "description": "Update a page and archive and output raw json",
-          "command": "$ notion-cli page update PAGE_ID -a -r"
-        },
-        {
-          "description": "Update a page and unarchive and output raw json",
-          "command": "$ notion-cli page update PAGE_ID -u -r"
+          "description": "Create a page from a template",
+          "command": "$ notion-cli template use \"meeting\" --to tasks --title \"Sprint Planning\""
         },
         {
-          "description": "Update a page and output JSON for automation",
-          "command": "$ notion-cli page update PAGE_ID -a --json"
+          "description": "Use default bookmark as target",
+          "command": "$ notion-cli template use \"task\" --title \"Fix login bug\""
         }
       ],
       "flags": {
-        "archived": {
-          "char": "a",
-          "description": "Archive the page",
-          "name": "archived",
+        "to": {
+          "description": "Target bookmark name, database name, or ID (defaults to default bookmark)",
+          "name": "to",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "title": {
+          "char": "t",
+          "description": "Page title (overrides any title in template properties)",
+          "name": "title",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "json": {
+          "char": "j",
+          "description": "Output as JSON (recommended for automation)",
+          "name": "json",
           "allowNo": false,
           "type": "boolean"
         },
-        "unarchive": {
-          "char": "u",
-          "description": "Unarchive the page",
-          "name": "unarchive",
+        "page-size": {
+          "description": "Items per page (1-100, default: 100 for automation)",
+          "name": "page-size",
+          "default": 100,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "retry": {
+          "description": "Auto-retry on rate limit (respects Retry-After header)",
+          "name": "retry",
           "allowNo": false,
           "type": "boolean"
         },
-        "properties": {
-          "description": "Page properties to update as JSON string",
-          "name": "properties",
+        "timeout": {
+          "description": "Request timeout in milliseconds",
+          "name": "timeout",
+          "default": 30000,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "simple-properties": {
-          "char": "S",
-          "description": "Use simplified property format (flat key-value pairs, recommended for AI agents)",
-          "name": "simple-properties",
+        "no-cache": {
+          "description": "Bypass cache and force fresh API calls",
+          "name": "no-cache",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
+          "env": "NOTION_CLI_VERBOSE",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "minimal": {
+          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
+          "name": "minimal",
           "allowNo": false,
           "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "template:use",
+      "pluginAlias": "@catafal/notion-cli",
+      "pluginName": "@catafal/notion-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "template",
+        "use.js"
+      ]
+    },
+    "user:list": {
+      "aliases": [
+        "user:l"
+      ],
+      "args": {},
+      "description": "List all users",
+      "examples": [
+        {
+          "description": "List all users",
+          "command": "$ notion-cli user list"
+        },
+        {
+          "description": "List all users and output raw json",
+          "command": "$ notion-cli user list -r"
         },
+        {
+          "description": "List all users and output JSON for automation",
+          "command": "$ notion-cli user list --json"
+        }
+      ],
+      "flags": {
         "raw": {
           "char": "r",
           "description": "output raw json",
@@ -6027,7 +5874,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "page:update",
+      "id": "user:list",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -6037,42 +5884,32 @@
       "relativePath": [
         "dist",
         "commands",
-        "page",
-        "update.js"
+        "user",
+        "list.js"
       ]
     },
-    "block:retrieve:children": {
+    "user:retrieve": {
       "aliases": [
-        "block:r:c"
+        "user:r"
       ],
       "args": {
-        "block_id": {
-          "description": "block_id or page_id",
-          "name": "block_id",
-          "required": true
+        "user_id": {
+          "name": "user_id"
         }
       },
-      "description": "Retrieve block children (supports database discovery via --show-databases)",
+      "description": "Retrieve a user",
       "examples": [
         {
-          "description": "Retrieve block children",
-          "command": "$ notion-cli block retrieve:children BLOCK_ID"
-        },
-        {
-          "description": "Retrieve block children and output raw json",
-          "command": "$ notion-cli block retrieve:children BLOCK_ID -r"
-        },
-        {
-          "description": "Retrieve block children and output JSON for automation",
-          "command": "$ notion-cli block retrieve:children BLOCK_ID --json"
+          "description": "Retrieve a user",
+          "command": "$ notion-cli user retrieve USER_ID"
         },
         {
-          "description": "Discover databases on a page with queryable IDs",
-          "command": "$ notion-cli block retrieve:children PAGE_ID --show-databases"
+          "description": "Retrieve a user and output raw json",
+          "command": "$ notion-cli user retrieve USER_ID -r"
         },
         {
-          "description": "Get databases as JSON for automation",
-          "command": "$ notion-cli block retrieve:children PAGE_ID --show-databases --json"
+          "description": "Retrieve a user and output JSON for automation",
+          "command": "$ notion-cli user retrieve USER_ID --json"
         }
       ],
       "flags": {
@@ -6083,13 +5920,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "show-databases": {
-          "char": "d",
-          "description": "show only child databases with their queryable IDs (data_source_id)",
-          "name": "show-databases",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "columns": {
           "description": "Only show provided columns (comma-separated)",
           "exclusive": [
@@ -6197,7 +6027,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "block:retrieve:children",
+      "id": "user:retrieve",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -6207,29 +6037,42 @@
       "relativePath": [
         "dist",
         "commands",
-        "block",
-        "retrieve",
-        "children.js"
+        "user",
+        "retrieve.js"
       ]
     },
-    "user:retrieve:bot": {
+    "block:retrieve:children": {
       "aliases": [
-        "user:r:b"
+        "block:r:c"
       ],
-      "args": {},
-      "description": "Retrieve a bot user",
+      "args": {
+        "block_id": {
+          "description": "block_id or page_id",
+          "name": "block_id",
+          "required": true
+        }
+      },
+      "description": "Retrieve block children (supports database discovery via --show-databases)",
       "examples": [
         {
-          "description": "Retrieve a bot user",
-          "command": "$ notion-cli user retrieve:bot"
+          "description": "Retrieve block children",
+          "command": "$ notion-cli block retrieve:children BLOCK_ID"
         },
         {
-          "description": "Retrieve a bot user and output raw json",
-          "command": "$ notion-cli user retrieve:bot -r"
+          "description": "Retrieve block children and output raw json",
+          "command": "$ notion-cli block retrieve:children BLOCK_ID -r"
         },
         {
-          "description": "Retrieve a bot user and output JSON for automation",
-          "command": "$ notion-cli user retrieve:bot --json"
+          "description": "Retrieve block children and output JSON for automation",
+          "command": "$ notion-cli block retrieve:children BLOCK_ID --json"
+        },
+        {
+          "description": "Discover databases on a page with queryable IDs",
+          "command": "$ notion-cli block retrieve:children PAGE_ID --show-databases"
+        },
+        {
+          "description": "Get databases as JSON for automation",
+          "command": "$ notion-cli block retrieve:children PAGE_ID --show-databases --json"
         }
       ],
       "flags": {
@@ -6240,6 +6083,13 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "show-databases": {
+          "char": "d",
+          "description": "show only child databases with their queryable IDs (data_source_id)",
+          "name": "show-databases",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "columns": {
           "description": "Only show provided columns (comma-separated)",
           "exclusive": [
@@ -6347,7 +6197,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "user:retrieve:bot",
+      "id": "block:retrieve:children",
       "pluginAlias": "@catafal/notion-cli",
       "pluginName": "@catafal/notion-cli",
       "pluginType": "core",
@@ -6357,9 +6207,9 @@
       "relativePath": [
         "dist",
         "commands",
-        "user",
+        "block",
         "retrieve",
-        "bot.js"
+        "children.js"
       ]
     },
     "page:retrieve:property_item": {
@@ -6465,7 +6315,157 @@
         "retrieve",
         "property_item.js"
       ]
+    },
+    "user:retrieve:bot": {
+      "aliases": [
+        "user:r:b"
+      ],
+      "args": {},
+      "description": "Retrieve a bot user",
+      "examples": [
+        {
+          "description": "Retrieve a bot user",
+          "command": "$ notion-cli user retrieve:bot"
+        },
+        {
+          "description": "Retrieve a bot user and output raw json",
+          "command": "$ notion-cli user retrieve:bot -r"
+        },
+        {
+          "description": "Retrieve a bot user and output JSON for automation",
+          "command": "$ notion-cli user retrieve:bot --json"
+        }
+      ],
+      "flags": {
+        "raw": {
+          "char": "r",
+          "description": "output raw json",
+          "name": "raw",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "columns": {
+          "description": "Only show provided columns (comma-separated)",
+          "exclusive": [
+            "extended"
+          ],
+          "name": "columns",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "sort": {
+          "description": "Property to sort by (prepend with - for descending)",
+          "name": "sort",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "filter": {
+          "description": "Filter property by substring match",
+          "name": "filter",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "csv": {
+          "description": "Output in CSV format",
+          "exclusive": [
+            "no-truncate"
+          ],
+          "name": "csv",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "extended": {
+          "char": "x",
+          "description": "Show extra columns",
+          "name": "extended",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "no-truncate": {
+          "description": "Do not truncate output to fit screen",
+          "exclusive": [
+            "csv"
+          ],
+          "name": "no-truncate",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "no-header": {
+          "description": "Hide table header from output",
+          "name": "no-header",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "json": {
+          "char": "j",
+          "description": "Output as JSON (recommended for automation)",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "page-size": {
+          "description": "Items per page (1-100, default: 100 for automation)",
+          "name": "page-size",
+          "default": 100,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "retry": {
+          "description": "Auto-retry on rate limit (respects Retry-After header)",
+          "name": "retry",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "timeout": {
+          "description": "Request timeout in milliseconds",
+          "name": "timeout",
+          "default": 30000,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "no-cache": {
+          "description": "Bypass cache and force fresh API calls",
+          "name": "no-cache",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Enable verbose logging to stderr (retry events, cache stats) - never pollutes stdout",
+          "env": "NOTION_CLI_VERBOSE",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "minimal": {
+          "description": "Strip unnecessary metadata (created_by, last_edited_by, object fields, request_id, etc.) - reduces response size by ~40%",
+          "name": "minimal",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "user:retrieve:bot",
+      "pluginAlias": "@catafal/notion-cli",
+      "pluginName": "@catafal/notion-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "user",
+        "retrieve",
+        "bot.js"
+      ]
     }
   },
-  "version": "5.9.0"
+  "version": "5.9.1"
 }