@sanity/cli 7.18.0 → 8.0.1

package/README.md

@@ -14,6 +14,7 @@ Code for sanity cli
   <!-- commands -->
 
 - [`sanity api ENDPOINT`](#sanity-api-endpoint)
+- [`sanity assets upload`](#sanity-assets-upload)
 - [`sanity backups disable [DATASET]`](#sanity-backups-disable-dataset)
 - [`sanity backups download [DATASET]`](#sanity-backups-download-dataset)
 - [`sanity backups enable [DATASET]`](#sanity-backups-enable-dataset)
@@ -119,6 +120,7 @@ Code for sanity cli
 - [`sanity tokens create [LABEL]`](#sanity-tokens-create-label)
 - [`sanity tokens delete [TOKENID]`](#sanity-tokens-delete-tokenid)
 - [`sanity tokens list`](#sanity-tokens-list)
+- [`sanity tokens rotate`](#sanity-tokens-rotate)
 - [`sanity typegen generate`](#sanity-typegen-generate)
 - [`sanity undeploy`](#sanity-undeploy)
 - [`sanity users invite [EMAIL]`](#sanity-users-invite-email)
@@ -212,6 +214,40 @@ EXAMPLES
     SANITY_AUTH_TOKEN=<token> sanity api users/me
 ```
 
+## `sanity assets upload`
+
+Upload one local image or file to a Sanity dataset and print the asset document as JSON
+
+```
+USAGE
+  $ sanity assets upload --file <path> [-p <id>] [-d <name>] [--content-type <mime-type>] [--filename <filename>]
+    [--type image|file]
+
+FLAGS
+  --content-type=<mime-type>  MIME type of the asset, such as image/png or application/pdf
+  --file=<path>               (required) Path to the local file to upload
+  --filename=<filename>       Original filename stored on the asset document. Defaults to the local filename
+  --type=<option>             [default: image] Asset type to create
+                              <options: image|file>
+
+OVERRIDE FLAGS
+  -d, --dataset=<name>   Dataset to upload the asset to (overrides CLI configuration)
+  -p, --project-id=<id>  Project ID to upload the asset to (overrides CLI configuration)
+
+DESCRIPTION
+  Upload one local image or file to a Sanity dataset and print the asset document as JSON
+
+EXAMPLES
+  Upload an image using the configured project
+
+    $ sanity assets upload --file ./hero.png --type image --dataset production
+
+  Upload a file with explicit project, dataset, and MIME type
+
+    $ sanity assets upload --file ./brief.pdf --type file --content-type application/pdf --project-id abc123 \
+      --dataset production
+```
+
 ## `sanity backups disable [DATASET]`
 
 Disable backup for a dataset
@@ -3601,15 +3637,16 @@ Create a new API token for the project
 
 ```
 USAGE
-  $ sanity tokens create [LABEL] [-p <id>] [--json] [--role viewer] [-y]
+  $ sanity tokens create [LABEL] [-p <id>] [--expires-at 2027-01-01] [--json] [--role viewer] [-y]
 
 ARGUMENTS
   [LABEL]  Label for the new token
 
 FLAGS
-  -y, --yes          Skip prompts and use defaults (unattended mode)
-      --json         Output as JSON
-      --role=viewer  Role to assign to the token (defaults to viewer in unattended mode)
+  -y, --yes                    Skip prompts and use defaults (unattended mode)
+      --expires-at=2027-01-01  Date or timestamp the token expires (ISO 8601; tokens never expire by default)
+      --json                   Output as JSON
+      --role=viewer            Role to assign to the token (defaults to viewer in unattended mode)
 
 OVERRIDE FLAGS
   -p, --project-id=<id>  Project ID to create token in (overrides CLI configuration)
@@ -3630,6 +3667,10 @@ EXAMPLES
 
     $ sanity tokens create "CI Token" --role=editor --yes
 
+  Create a token that expires on a given date
+
+    $ sanity tokens create "Build Token" --expires-at 2027-01-01
+
   Output token information as JSON
 
     $ sanity tokens create "API Token" --json
@@ -3708,6 +3749,35 @@ EXAMPLES
     $ sanity tokens list --project-id abc123
 ```
 
+## `sanity tokens rotate`
+
+Rotate an API token, replacing its secret with a new one
+
+```
+USAGE
+  $ sanity tokens rotate [--json] [-t <token>]
+
+FLAGS
+  -t, --token=<token>  Token to rotate (prefer standard input to keep it out of shell history)
+      --json           Output as JSON
+
+DESCRIPTION
+  Rotate an API token, replacing its secret with a new one
+
+EXAMPLES
+  Rotate the token piped on standard input
+
+    echo "$SANITY_TOKEN" | sanity tokens rotate
+
+  Rotate a token read from a file
+
+    $ sanity tokens rotate < token.txt
+
+  Output the rotated token as JSON
+
+    echo "$SANITY_TOKEN" | sanity tokens rotate --json
+```
+
 ## `sanity typegen generate`
 
 Sanity TypeGen

package/dist/SanityHelp.js

@@ -1,13 +1,6 @@
 import { Help } from '@oclif/core';
 import { getBinCommand, getRunningPackageManager } from '@sanity/cli-core/package-manager';
-import { topicAliases } from './topicAliases.js';
-// Reverse map: alias name → canonical topic name
-const aliasToCanonical = new Map();
-for (const [canonical, aliases] of Object.entries(topicAliases)){
-    for (const alias of aliases){
-        aliasToCanonical.set(alias, canonical);
-    }
-}
+import { resolveTopicAliasInArgv } from './topicAliases.js';
 // Running `oclif readme`, we don't want to apply the `prefixBinName` transformation,
 // as it will include whatever pm was used to spawn the script in the generated readme.
 // argv will contain something like [nodeBinPath, oclifBinPath, 'readme', …] so check
@@ -88,32 +81,5 @@ function needsFlagSeparator() {
     const pm = getRunningPackageManager();
     return pm === 'npm' || !pm;
 }
-/**
- * Replace the first positional argument in argv with the canonical topic name
- * if it is a known topic alias. This ensures that `sanity dataset --help`
- * resolves to the same help output as `sanity datasets --help`.
- *
- * Without this, `--help` bypasses the command_not_found hook (which normally
- * handles alias resolution) and the help system fails to find the topic.
- *
- * @internal
- */ export function resolveTopicAliasInArgv(argv) {
-    for(let i = 0; i < argv.length; i++){
-        const arg = argv[i];
-        if (arg === '--') break;
-        if (arg.startsWith('-')) continue;
-        // First positional argument is the topic/command name
-        const canonical = aliasToCanonical.get(arg);
-        if (canonical) {
-            const resolved = [
-                ...argv
-            ];
-            resolved[i] = canonical;
-            return resolved;
-        }
-        break;
-    }
-    return argv;
-}
 
 //# sourceMappingURL=SanityHelp.js.map

package/dist/SanityHelp.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/SanityHelp.ts"],"sourcesContent":["import {Command, CommandHelp, Help, Interfaces} from '@oclif/core'\nimport {getBinCommand, getRunningPackageManager} from '@sanity/cli-core/package-manager'\n\nimport {topicAliases} from './topicAliases.js'\n\n// Reverse map: alias name → canonical topic name\nconst aliasToCanonical = new Map<string, string>()\nfor (const [canonical, aliases] of Object.entries(topicAliases)) {\n  for (const alias of aliases) {\n    aliasToCanonical.set(alias, canonical)\n  }\n}\n\n// Running `oclif readme`, we don't want to apply the `prefixBinName` transformation,\n// as it will include whatever pm was used to spawn the script in the generated readme.\n// argv will contain something like [nodeBinPath, oclifBinPath, 'readme', …] so check\n// for 'readme' with a preceeding argument that includes 'oclif' to be sure.\nconst IS_README_GENERATION = (process.argv[process.argv.indexOf('readme') - 1] ?? '').includes(\n  'oclif',\n)\n\n/**\n * Custom Help class for Sanity CLI that overrides the default help formatting to\n * prefix the bin name (e.g., `npx sanity`, `yarn sanity`, etc.) in the help text,\n * and to replace `sanity init` references with the appropriate `create` command\n * for the detected package manager when needed.\n *\n * @internal\n */\nexport default class SanityHelp extends Help {\n  protected formatCommand(command: Command.Loadable): string {\n    let help = super.formatCommand(command)\n\n    // When `sanity init` is called, but originates from the `create-sanity`\n    // package/binary (eg the one used by `npm create sanity@latest` etc), we want to\n    // customize the help text to show that command instead of `sanity init`.\n    const isFromCreate = process.argv.includes('--from-create') && command.id === 'init'\n    if (isFromCreate) {\n      help = replaceInitWithCreateCommand(help)\n    }\n\n    return prefixBinName(help)\n  }\n\n  protected formatRoot(): string {\n    return prefixBinName(super.formatRoot())\n  }\n\n  protected formatTopic(topic: Interfaces.Topic): string {\n    return prefixBinName(super.formatTopic(topic))\n  }\n\n  protected override getCommandHelpClass(command: Command.Loadable): CommandHelp {\n    const commandHelp = super.getCommandHelpClass(command)\n    if (command.id === 'login') {\n      commandHelp.opts = {...commandHelp.opts, flagSortOrder: 'none'}\n    }\n    return commandHelp\n  }\n\n  async showHelp(argv: string[]): Promise<void> {\n    return super.showHelp(resolveTopicAliasInArgv(argv))\n  }\n}\n\n/**\n * @internal\n */\nexport function prefixBinName(help: string): string {\n  if (IS_README_GENERATION) return help\n  const binCommand = getBinCommand()\n  if (binCommand === 'sanity') return help\n  return help.replaceAll('$ sanity', `$ ${binCommand}`)\n}\n\n/**\n * Replace `sanity init` references in help text with the equivalent `create` command\n * for the detected package manager. Lines ending in just `sanity init\\n` (no flags)\n * are replaced without a flag separator, while lines with flags get the separator\n * (eg `--` for npm) so the flags are forwarded correctly.\n *\n * @internal\n */\nexport function replaceInitWithCreateCommand(help: string): string {\n  const createCmd = guessCreateCommand()\n  const flagSeparator = needsFlagSeparator() ? ' --' : ''\n\n  // First replace all `sanity init` references that ends with a newline with the\n  // create variant that does not include any flag separator (eg `--`). Then replace\n  // the other references that do. Most package managers do not require the `--`\n  // separator, but npm does. Only include it if we need to, as the commands look\n  // cleaner without it.\n  return help\n    .replaceAll(/(\\s+)sanity\\s+init\\s*\\n/g, `$1${createCmd}\\n`)\n    .replaceAll(/(\\s+)sanity(\\s+)init/g, `$1${createCmd}${flagSeparator}`)\n}\n\nfunction guessCreateCommand() {\n  const pm = getRunningPackageManager()\n  if (pm === 'yarn') return `yarn create sanity`\n  if (pm === 'bun') return `bun create sanity@latest`\n  if (pm === 'pnpm') return `pnpm create sanity@latest`\n  return `npm create sanity@latest`\n}\n\nfunction needsFlagSeparator() {\n  const pm = getRunningPackageManager()\n  return pm === 'npm' || !pm\n}\n\n/**\n * Replace the first positional argument in argv with the canonical topic name\n * if it is a known topic alias. This ensures that `sanity dataset --help`\n * resolves to the same help output as `sanity datasets --help`.\n *\n * Without this, `--help` bypasses the command_not_found hook (which normally\n * handles alias resolution) and the help system fails to find the topic.\n *\n * @internal\n */\nexport function resolveTopicAliasInArgv(argv: string[]): string[] {\n  for (let i = 0; i < argv.length; i++) {\n    const arg = argv[i]\n    if (arg === '--') break\n    if (arg.startsWith('-')) continue\n\n    // First positional argument is the topic/command name\n    const canonical = aliasToCanonical.get(arg)\n    if (canonical) {\n      const resolved = [...argv]\n      resolved[i] = canonical\n      return resolved\n    }\n    break\n  }\n  return argv\n}\n"],"names":["Help","getBinCommand","getRunningPackageManager","topicAliases","aliasToCanonical","Map","canonical","aliases","Object","entries","alias","set","IS_README_GENERATION","process","argv","indexOf","includes","SanityHelp","formatCommand","command","help","isFromCreate","id","replaceInitWithCreateCommand","prefixBinName","formatRoot","formatTopic","topic","getCommandHelpClass","commandHelp","opts","flagSortOrder","showHelp","resolveTopicAliasInArgv","binCommand","replaceAll","createCmd","guessCreateCommand","flagSeparator","needsFlagSeparator","pm","i","length","arg","startsWith","get","resolved"],"mappings":"AAAA,SAA8BA,IAAI,QAAmB,cAAa;AAClE,SAAQC,aAAa,EAAEC,wBAAwB,QAAO,mCAAkC;AAExF,SAAQC,YAAY,QAAO,oBAAmB;AAE9C,iDAAiD;AACjD,MAAMC,mBAAmB,IAAIC;AAC7B,KAAK,MAAM,CAACC,WAAWC,QAAQ,IAAIC,OAAOC,OAAO,CAACN,cAAe;IAC/D,KAAK,MAAMO,SAASH,QAAS;QAC3BH,iBAAiBO,GAAG,CAACD,OAAOJ;IAC9B;AACF;AAEA,qFAAqF;AACrF,uFAAuF;AACvF,qFAAqF;AACrF,4EAA4E;AAC5E,MAAMM,uBAAuB,AAACC,CAAAA,QAAQC,IAAI,CAACD,QAAQC,IAAI,CAACC,OAAO,CAAC,YAAY,EAAE,IAAI,EAAC,EAAGC,QAAQ,CAC5F;AAGF;;;;;;;CAOC,GACD,eAAe,MAAMC,mBAAmBjB;IAC5BkB,cAAcC,OAAyB,EAAU;QACzD,IAAIC,OAAO,KAAK,CAACF,cAAcC;QAE/B,wEAAwE;QACxE,iFAAiF;QACjF,yEAAyE;QACzE,MAAME,eAAeR,QAAQC,IAAI,CAACE,QAAQ,CAAC,oBAAoBG,QAAQG,EAAE,KAAK;QAC9E,IAAID,cAAc;YAChBD,OAAOG,6BAA6BH;QACtC;QAEA,OAAOI,cAAcJ;IACvB;IAEUK,aAAqB;QAC7B,OAAOD,cAAc,KAAK,CAACC;IAC7B;IAEUC,YAAYC,KAAuB,EAAU;QACrD,OAAOH,cAAc,KAAK,CAACE,YAAYC;IACzC;IAEmBC,oBAAoBT,OAAyB,EAAe;QAC7E,MAAMU,cAAc,KAAK,CAACD,oBAAoBT;QAC9C,IAAIA,QAAQG,EAAE,KAAK,SAAS;YAC1BO,YAAYC,IAAI,GAAG;gBAAC,GAAGD,YAAYC,IAAI;gBAAEC,eAAe;YAAM;QAChE;QACA,OAAOF;IACT;IAEA,MAAMG,SAASlB,IAAc,EAAiB;QAC5C,OAAO,KAAK,CAACkB,SAASC,wBAAwBnB;IAChD;AACF;AAEA;;CAEC,GACD,OAAO,SAASU,cAAcJ,IAAY;IACxC,IAAIR,sBAAsB,OAAOQ;IACjC,MAAMc,aAAajC;IACnB,IAAIiC,eAAe,UAAU,OAAOd;IACpC,OAAOA,KAAKe,UAAU,CAAC,YAAY,CAAC,EAAE,EAAED,YAAY;AACtD;AAEA;;;;;;;CAOC,GACD,OAAO,SAASX,6BAA6BH,IAAY;IACvD,MAAMgB,YAAYC;IAClB,MAAMC,gBAAgBC,uBAAuB,QAAQ;IAErD,+EAA+E;IAC/E,kFAAkF;IAClF,8EAA8E;IAC9E,+EAA+E;IAC/E,sBAAsB;IACtB,OAAOnB,KACJe,UAAU,CAAC,4BAA4B,CAAC,EAAE,EAAEC,UAAU,EAAE,CAAC,EACzDD,UAAU,CAAC,yBAAyB,CAAC,EAAE,EAAEC,YAAYE,eAAe;AACzE;AAEA,SAASD;IACP,MAAMG,KAAKtC;IACX,IAAIsC,OAAO,QAAQ,OAAO,CAAC,kBAAkB,CAAC;IAC9C,IAAIA,OAAO,OAAO,OAAO,CAAC,wBAAwB,CAAC;IACnD,IAAIA,OAAO,QAAQ,OAAO,CAAC,yBAAyB,CAAC;IACrD,OAAO,CAAC,wBAAwB,CAAC;AACnC;AAEA,SAASD;IACP,MAAMC,KAAKtC;IACX,OAAOsC,OAAO,SAAS,CAACA;AAC1B;AAEA;;;;;;;;;CASC,GACD,OAAO,SAASP,wBAAwBnB,IAAc;IACpD,IAAK,IAAI2B,IAAI,GAAGA,IAAI3B,KAAK4B,MAAM,EAAED,IAAK;QACpC,MAAME,MAAM7B,IAAI,CAAC2B,EAAE;QACnB,IAAIE,QAAQ,MAAM;QAClB,IAAIA,IAAIC,UAAU,CAAC,MAAM;QAEzB,sDAAsD;QACtD,MAAMtC,YAAYF,iBAAiByC,GAAG,CAACF;QACvC,IAAIrC,WAAW;YACb,MAAMwC,WAAW;mBAAIhC;aAAK;YAC1BgC,QAAQ,CAACL,EAAE,GAAGnC;YACd,OAAOwC;QACT;QACA;IACF;IACA,OAAOhC;AACT"}
+{"version":3,"sources":["../src/SanityHelp.ts"],"sourcesContent":["import {Command, CommandHelp, Help, Interfaces} from '@oclif/core'\nimport {getBinCommand, getRunningPackageManager} from '@sanity/cli-core/package-manager'\n\nimport {resolveTopicAliasInArgv} from './topicAliases.js'\n\n// Running `oclif readme`, we don't want to apply the `prefixBinName` transformation,\n// as it will include whatever pm was used to spawn the script in the generated readme.\n// argv will contain something like [nodeBinPath, oclifBinPath, 'readme', …] so check\n// for 'readme' with a preceeding argument that includes 'oclif' to be sure.\nconst IS_README_GENERATION = (process.argv[process.argv.indexOf('readme') - 1] ?? '').includes(\n  'oclif',\n)\n\n/**\n * Custom Help class for Sanity CLI that overrides the default help formatting to\n * prefix the bin name (e.g., `npx sanity`, `yarn sanity`, etc.) in the help text,\n * and to replace `sanity init` references with the appropriate `create` command\n * for the detected package manager when needed.\n *\n * @internal\n */\nexport default class SanityHelp extends Help {\n  protected formatCommand(command: Command.Loadable): string {\n    let help = super.formatCommand(command)\n\n    // When `sanity init` is called, but originates from the `create-sanity`\n    // package/binary (eg the one used by `npm create sanity@latest` etc), we want to\n    // customize the help text to show that command instead of `sanity init`.\n    const isFromCreate = process.argv.includes('--from-create') && command.id === 'init'\n    if (isFromCreate) {\n      help = replaceInitWithCreateCommand(help)\n    }\n\n    return prefixBinName(help)\n  }\n\n  protected formatRoot(): string {\n    return prefixBinName(super.formatRoot())\n  }\n\n  protected formatTopic(topic: Interfaces.Topic): string {\n    return prefixBinName(super.formatTopic(topic))\n  }\n\n  protected override getCommandHelpClass(command: Command.Loadable): CommandHelp {\n    const commandHelp = super.getCommandHelpClass(command)\n    if (command.id === 'login') {\n      commandHelp.opts = {...commandHelp.opts, flagSortOrder: 'none'}\n    }\n    return commandHelp\n  }\n\n  async showHelp(argv: string[]): Promise<void> {\n    return super.showHelp(resolveTopicAliasInArgv(argv))\n  }\n}\n\n/**\n * @internal\n */\nexport function prefixBinName(help: string): string {\n  if (IS_README_GENERATION) return help\n  const binCommand = getBinCommand()\n  if (binCommand === 'sanity') return help\n  return help.replaceAll('$ sanity', `$ ${binCommand}`)\n}\n\n/**\n * Replace `sanity init` references in help text with the equivalent `create` command\n * for the detected package manager. Lines ending in just `sanity init\\n` (no flags)\n * are replaced without a flag separator, while lines with flags get the separator\n * (eg `--` for npm) so the flags are forwarded correctly.\n *\n * @internal\n */\nexport function replaceInitWithCreateCommand(help: string): string {\n  const createCmd = guessCreateCommand()\n  const flagSeparator = needsFlagSeparator() ? ' --' : ''\n\n  // First replace all `sanity init` references that ends with a newline with the\n  // create variant that does not include any flag separator (eg `--`). Then replace\n  // the other references that do. Most package managers do not require the `--`\n  // separator, but npm does. Only include it if we need to, as the commands look\n  // cleaner without it.\n  return help\n    .replaceAll(/(\\s+)sanity\\s+init\\s*\\n/g, `$1${createCmd}\\n`)\n    .replaceAll(/(\\s+)sanity(\\s+)init/g, `$1${createCmd}${flagSeparator}`)\n}\n\nfunction guessCreateCommand() {\n  const pm = getRunningPackageManager()\n  if (pm === 'yarn') return `yarn create sanity`\n  if (pm === 'bun') return `bun create sanity@latest`\n  if (pm === 'pnpm') return `pnpm create sanity@latest`\n  return `npm create sanity@latest`\n}\n\nfunction needsFlagSeparator() {\n  const pm = getRunningPackageManager()\n  return pm === 'npm' || !pm\n}\n"],"names":["Help","getBinCommand","getRunningPackageManager","resolveTopicAliasInArgv","IS_README_GENERATION","process","argv","indexOf","includes","SanityHelp","formatCommand","command","help","isFromCreate","id","replaceInitWithCreateCommand","prefixBinName","formatRoot","formatTopic","topic","getCommandHelpClass","commandHelp","opts","flagSortOrder","showHelp","binCommand","replaceAll","createCmd","guessCreateCommand","flagSeparator","needsFlagSeparator","pm"],"mappings":"AAAA,SAA8BA,IAAI,QAAmB,cAAa;AAClE,SAAQC,aAAa,EAAEC,wBAAwB,QAAO,mCAAkC;AAExF,SAAQC,uBAAuB,QAAO,oBAAmB;AAEzD,qFAAqF;AACrF,uFAAuF;AACvF,qFAAqF;AACrF,4EAA4E;AAC5E,MAAMC,uBAAuB,AAACC,CAAAA,QAAQC,IAAI,CAACD,QAAQC,IAAI,CAACC,OAAO,CAAC,YAAY,EAAE,IAAI,EAAC,EAAGC,QAAQ,CAC5F;AAGF;;;;;;;CAOC,GACD,eAAe,MAAMC,mBAAmBT;IAC5BU,cAAcC,OAAyB,EAAU;QACzD,IAAIC,OAAO,KAAK,CAACF,cAAcC;QAE/B,wEAAwE;QACxE,iFAAiF;QACjF,yEAAyE;QACzE,MAAME,eAAeR,QAAQC,IAAI,CAACE,QAAQ,CAAC,oBAAoBG,QAAQG,EAAE,KAAK;QAC9E,IAAID,cAAc;YAChBD,OAAOG,6BAA6BH;QACtC;QAEA,OAAOI,cAAcJ;IACvB;IAEUK,aAAqB;QAC7B,OAAOD,cAAc,KAAK,CAACC;IAC7B;IAEUC,YAAYC,KAAuB,EAAU;QACrD,OAAOH,cAAc,KAAK,CAACE,YAAYC;IACzC;IAEmBC,oBAAoBT,OAAyB,EAAe;QAC7E,MAAMU,cAAc,KAAK,CAACD,oBAAoBT;QAC9C,IAAIA,QAAQG,EAAE,KAAK,SAAS;YAC1BO,YAAYC,IAAI,GAAG;gBAAC,GAAGD,YAAYC,IAAI;gBAAEC,eAAe;YAAM;QAChE;QACA,OAAOF;IACT;IAEA,MAAMG,SAASlB,IAAc,EAAiB;QAC5C,OAAO,KAAK,CAACkB,SAASrB,wBAAwBG;IAChD;AACF;AAEA;;CAEC,GACD,OAAO,SAASU,cAAcJ,IAAY;IACxC,IAAIR,sBAAsB,OAAOQ;IACjC,MAAMa,aAAaxB;IACnB,IAAIwB,eAAe,UAAU,OAAOb;IACpC,OAAOA,KAAKc,UAAU,CAAC,YAAY,CAAC,EAAE,EAAED,YAAY;AACtD;AAEA;;;;;;;CAOC,GACD,OAAO,SAASV,6BAA6BH,IAAY;IACvD,MAAMe,YAAYC;IAClB,MAAMC,gBAAgBC,uBAAuB,QAAQ;IAErD,+EAA+E;IAC/E,kFAAkF;IAClF,8EAA8E;IAC9E,+EAA+E;IAC/E,sBAAsB;IACtB,OAAOlB,KACJc,UAAU,CAAC,4BAA4B,CAAC,EAAE,EAAEC,UAAU,EAAE,CAAC,EACzDD,UAAU,CAAC,yBAAyB,CAAC,EAAE,EAAEC,YAAYE,eAAe;AACzE;AAEA,SAASD;IACP,MAAMG,KAAK7B;IACX,IAAI6B,OAAO,QAAQ,OAAO,CAAC,kBAAkB,CAAC;IAC9C,IAAIA,OAAO,OAAO,OAAO,CAAC,wBAAwB,CAAC;IACnD,IAAIA,OAAO,QAAQ,OAAO,CAAC,yBAAyB,CAAC;IACrD,OAAO,CAAC,wBAAwB,CAAC;AACnC;AAEA,SAASD;IACP,MAAMC,KAAK7B;IACX,OAAO6B,OAAO,SAAS,CAACA;AAC1B"}

package/dist/actions/assets/assetFileError.js

@@ -0,0 +1,9 @@
+export class AssetFileError extends Error {
+    reason;
+    constructor(reason){
+        super(reason), this.reason = reason;
+        this.name = 'AssetFileError';
+    }
+}
+
+//# sourceMappingURL=assetFileError.js.map

package/dist/actions/assets/assetFileError.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/assets/assetFileError.ts"],"sourcesContent":["export class AssetFileError extends Error {\n  constructor(public readonly reason: 'not-file' | 'unreadable') {\n    super(reason)\n    this.name = 'AssetFileError'\n  }\n}\n"],"names":["AssetFileError","Error","reason","name"],"mappings":"AAAA,OAAO,MAAMA,uBAAuBC;;IAClC,YAAY,AAAgBC,MAAiC,CAAE;QAC7D,KAAK,CAACA,cADoBA,SAAAA;QAE1B,IAAI,CAACC,IAAI,GAAG;IACd;AACF"}

package/dist/actions/assets/uploadAssetFromFile.js

@@ -0,0 +1,40 @@
+import { open } from 'node:fs/promises';
+import { uploadAsset } from '../../services/assets.js';
+import { AssetFileError } from './assetFileError.js';
+async function openAssetFile(filePath) {
+    let fileHandle;
+    try {
+        fileHandle = await open(filePath, 'r');
+        const fileStat = await fileHandle.stat();
+        if (!fileStat.isFile()) throw new AssetFileError('not-file');
+        return {
+            fileHandle,
+            fileSize: fileStat.size
+        };
+    } catch (error) {
+        await fileHandle?.close();
+        if (error instanceof AssetFileError) throw error;
+        throw new AssetFileError('unreadable');
+    }
+}
+export async function uploadAssetFromFile(options) {
+    options.signal?.throwIfAborted();
+    const { filePath, ...uploadOptions } = options;
+    const { fileHandle, fileSize } = await openAssetFile(filePath);
+    const fileStream = fileHandle.createReadStream({
+        autoClose: false
+    });
+    try {
+        options.signal?.throwIfAborted();
+        return await uploadAsset({
+            ...uploadOptions,
+            body: fileStream,
+            fileSize
+        });
+    } finally{
+        fileStream.destroy();
+        await fileHandle.close();
+    }
+}
+
+//# sourceMappingURL=uploadAssetFromFile.js.map

package/dist/actions/assets/uploadAssetFromFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/assets/uploadAssetFromFile.ts"],"sourcesContent":["import {type FileHandle, open} from 'node:fs/promises'\n\nimport {type AssetType, uploadAsset} from '../../services/assets.js'\nimport {AssetFileError} from './assetFileError.js'\n\ninterface UploadAssetFromFileOptions {\n  assetType: AssetType\n  dataset: string\n  filename: string\n  filePath: string\n  projectId: string\n\n  contentType?: string\n  onProgress?: (percent: number) => void\n  signal?: AbortSignal\n}\n\nasync function openAssetFile(\n  filePath: string,\n): Promise<{fileHandle: FileHandle; fileSize: number}> {\n  let fileHandle: FileHandle | undefined\n\n  try {\n    fileHandle = await open(filePath, 'r')\n    const fileStat = await fileHandle.stat()\n    if (!fileStat.isFile()) throw new AssetFileError('not-file')\n\n    return {fileHandle, fileSize: fileStat.size}\n  } catch (error) {\n    await fileHandle?.close()\n    if (error instanceof AssetFileError) throw error\n    throw new AssetFileError('unreadable')\n  }\n}\n\nexport async function uploadAssetFromFile(options: UploadAssetFromFileOptions) {\n  options.signal?.throwIfAborted()\n  const {filePath, ...uploadOptions} = options\n  const {fileHandle, fileSize} = await openAssetFile(filePath)\n  const fileStream = fileHandle.createReadStream({autoClose: false})\n\n  try {\n    options.signal?.throwIfAborted()\n    return await uploadAsset({...uploadOptions, body: fileStream, fileSize})\n  } finally {\n    fileStream.destroy()\n    await fileHandle.close()\n  }\n}\n"],"names":["open","uploadAsset","AssetFileError","openAssetFile","filePath","fileHandle","fileStat","stat","isFile","fileSize","size","error","close","uploadAssetFromFile","options","signal","throwIfAborted","uploadOptions","fileStream","createReadStream","autoClose","body","destroy"],"mappings":"AAAA,SAAyBA,IAAI,QAAO,mBAAkB;AAEtD,SAAwBC,WAAW,QAAO,2BAA0B;AACpE,SAAQC,cAAc,QAAO,sBAAqB;AAclD,eAAeC,cACbC,QAAgB;IAEhB,IAAIC;IAEJ,IAAI;QACFA,aAAa,MAAML,KAAKI,UAAU;QAClC,MAAME,WAAW,MAAMD,WAAWE,IAAI;QACtC,IAAI,CAACD,SAASE,MAAM,IAAI,MAAM,IAAIN,eAAe;QAEjD,OAAO;YAACG;YAAYI,UAAUH,SAASI,IAAI;QAAA;IAC7C,EAAE,OAAOC,OAAO;QACd,MAAMN,YAAYO;QAClB,IAAID,iBAAiBT,gBAAgB,MAAMS;QAC3C,MAAM,IAAIT,eAAe;IAC3B;AACF;AAEA,OAAO,eAAeW,oBAAoBC,OAAmC;IAC3EA,QAAQC,MAAM,EAAEC;IAChB,MAAM,EAACZ,QAAQ,EAAE,GAAGa,eAAc,GAAGH;IACrC,MAAM,EAACT,UAAU,EAAEI,QAAQ,EAAC,GAAG,MAAMN,cAAcC;IACnD,MAAMc,aAAab,WAAWc,gBAAgB,CAAC;QAACC,WAAW;IAAK;IAEhE,IAAI;QACFN,QAAQC,MAAM,EAAEC;QAChB,OAAO,MAAMf,YAAY;YAAC,GAAGgB,aAAa;YAAEI,MAAMH;YAAYT;QAAQ;IACxE,SAAU;QACRS,WAAWI,OAAO;QAClB,MAAMjB,WAAWO,KAAK;IACxB;AACF"}

package/dist/actions/assets/uploadAssetWithProgress.js

@@ -0,0 +1,76 @@
+import { getCliExecutionContext } from '@sanity/cli-core/executionContext';
+import { spinner } from '@sanity/cli-core/ux';
+import { uploadAssetFromFile } from './uploadAssetFromFile.js';
+export async function uploadAssetWithProgress(options) {
+    const { assetType, isInteractive, logToStderr, ...uploadOptions } = options;
+    const uploadMessage = `Uploading ${assetType} asset`;
+    const assetDocumentMessage = `Creating ${assetType} asset document`;
+    const executionContext = getCliExecutionContext();
+    const isTTY = !executionContext && isInteractive;
+    const uploadProgress = spinner(isTTY ? `${uploadMessage} [0%]. Large uploads may take several minutes.` : `${uploadMessage}. Large uploads may take several minutes.`).start();
+    if (executionContext) logToStderr(`${uploadMessage}. Large uploads may take several minutes.`);
+    let assetDocumentProgress;
+    let assetDocumentStarted = false;
+    let lastReportedProgress = 0;
+    let nextNonInteractiveCheckpoint = 25;
+    const startAssetDocument = ()=>{
+        if (assetDocumentStarted) return;
+        assetDocumentStarted = true;
+        if (!isTTY) {
+            uploadProgress.text = assetDocumentMessage;
+            logToStderr(assetDocumentMessage);
+            return;
+        }
+        uploadProgress.succeed(`${uploadMessage} [100%]`);
+        assetDocumentProgress = spinner(assetDocumentMessage).start();
+    };
+    const uploadController = new AbortController();
+    const interruptUpload = ()=>uploadController.abort(new Error('SIGINT'));
+    const handlesInterrupt = !executionContext;
+    if (handlesInterrupt) process.once('SIGINT', interruptUpload);
+    // Ora uses raw mode for Ctrl+C, but its input listener does not always make stdin flow.
+    const resumesInterruptInput = handlesInterrupt && isTTY && uploadProgress.isSpinning && process.stdin.isTTY && process.stdin.isRaw && process.stdin.readableFlowing !== true;
+    if (resumesInterruptInput) process.stdin.resume();
+    try {
+        const asset = await uploadAssetFromFile({
+            ...uploadOptions,
+            assetType,
+            onProgress: (percent)=>{
+                const progress = Math.min(100, Math.floor(percent));
+                if (progress <= lastReportedProgress) return;
+                lastReportedProgress = progress;
+                if (progress === 100) {
+                    startAssetDocument();
+                } else {
+                    uploadProgress.text = `${uploadMessage} [${progress}%]`;
+                    if (!isTTY && progress >= nextNonInteractiveCheckpoint) {
+                        const checkpoint = Math.min(75, Math.floor(progress / 25) * 25);
+                        logToStderr(`${uploadMessage} [${checkpoint}%]`);
+                        nextNonInteractiveCheckpoint = checkpoint + 25;
+                    }
+                }
+            },
+            signal: uploadController.signal
+        });
+        if (isTTY) {
+            startAssetDocument();
+            assetDocumentProgress?.succeed(assetDocumentMessage);
+            spinner().succeed(`Uploaded ${assetType} asset: ${asset._id}`);
+        } else if (executionContext) {
+            logToStderr(`Uploaded ${assetType} asset: ${asset._id}`);
+        } else {
+            uploadProgress.succeed(`Uploaded ${assetType} asset: ${asset._id}`);
+        }
+        return asset;
+    } catch (error) {
+        const activeProgress = assetDocumentProgress ?? uploadProgress;
+        activeProgress.stop();
+        uploadController.signal.throwIfAborted();
+        throw error;
+    } finally{
+        if (handlesInterrupt) process.off('SIGINT', interruptUpload);
+        if (resumesInterruptInput) process.stdin.pause();
+    }
+}
+
+//# sourceMappingURL=uploadAssetWithProgress.js.map

package/dist/actions/assets/uploadAssetWithProgress.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/assets/uploadAssetWithProgress.ts"],"sourcesContent":["import {getCliExecutionContext} from '@sanity/cli-core/executionContext'\nimport {spinner} from '@sanity/cli-core/ux'\n\nimport {type AssetType} from '../../services/assets.js'\nimport {uploadAssetFromFile} from './uploadAssetFromFile.js'\n\ninterface UploadAssetWithProgressOptions {\n  assetType: AssetType\n  dataset: string\n  filename: string\n  filePath: string\n  isInteractive: boolean\n  logToStderr: (message: string) => void\n  projectId: string\n\n  contentType?: string\n}\n\nexport async function uploadAssetWithProgress(options: UploadAssetWithProgressOptions) {\n  const {assetType, isInteractive, logToStderr, ...uploadOptions} = options\n  const uploadMessage = `Uploading ${assetType} asset`\n  const assetDocumentMessage = `Creating ${assetType} asset document`\n  const executionContext = getCliExecutionContext()\n  const isTTY = !executionContext && isInteractive\n  const uploadProgress = spinner(\n    isTTY\n      ? `${uploadMessage} [0%]. Large uploads may take several minutes.`\n      : `${uploadMessage}. Large uploads may take several minutes.`,\n  ).start()\n  if (executionContext) logToStderr(`${uploadMessage}. Large uploads may take several minutes.`)\n\n  let assetDocumentProgress: ReturnType<typeof spinner> | undefined\n  let assetDocumentStarted = false\n  let lastReportedProgress = 0\n  let nextNonInteractiveCheckpoint = 25\n\n  const startAssetDocument = () => {\n    if (assetDocumentStarted) return\n    assetDocumentStarted = true\n    if (!isTTY) {\n      uploadProgress.text = assetDocumentMessage\n      logToStderr(assetDocumentMessage)\n      return\n    }\n\n    uploadProgress.succeed(`${uploadMessage} [100%]`)\n    assetDocumentProgress = spinner(assetDocumentMessage).start()\n  }\n\n  const uploadController = new AbortController()\n  const interruptUpload = () => uploadController.abort(new Error('SIGINT'))\n  const handlesInterrupt = !executionContext\n  if (handlesInterrupt) process.once('SIGINT', interruptUpload)\n\n  // Ora uses raw mode for Ctrl+C, but its input listener does not always make stdin flow.\n  const resumesInterruptInput =\n    handlesInterrupt &&\n    isTTY &&\n    uploadProgress.isSpinning &&\n    process.stdin.isTTY &&\n    process.stdin.isRaw &&\n    process.stdin.readableFlowing !== true\n  if (resumesInterruptInput) process.stdin.resume()\n\n  try {\n    const asset = await uploadAssetFromFile({\n      ...uploadOptions,\n      assetType,\n      onProgress: (percent) => {\n        const progress = Math.min(100, Math.floor(percent))\n        if (progress <= lastReportedProgress) return\n\n        lastReportedProgress = progress\n        if (progress === 100) {\n          startAssetDocument()\n        } else {\n          uploadProgress.text = `${uploadMessage} [${progress}%]`\n          if (!isTTY && progress >= nextNonInteractiveCheckpoint) {\n            const checkpoint = Math.min(75, Math.floor(progress / 25) * 25)\n            logToStderr(`${uploadMessage} [${checkpoint}%]`)\n            nextNonInteractiveCheckpoint = checkpoint + 25\n          }\n        }\n      },\n      signal: uploadController.signal,\n    })\n\n    if (isTTY) {\n      startAssetDocument()\n      assetDocumentProgress?.succeed(assetDocumentMessage)\n      spinner().succeed(`Uploaded ${assetType} asset: ${asset._id}`)\n    } else if (executionContext) {\n      logToStderr(`Uploaded ${assetType} asset: ${asset._id}`)\n    } else {\n      uploadProgress.succeed(`Uploaded ${assetType} asset: ${asset._id}`)\n    }\n\n    return asset\n  } catch (error) {\n    const activeProgress = assetDocumentProgress ?? uploadProgress\n    activeProgress.stop()\n    uploadController.signal.throwIfAborted()\n    throw error\n  } finally {\n    if (handlesInterrupt) process.off('SIGINT', interruptUpload)\n    if (resumesInterruptInput) process.stdin.pause()\n  }\n}\n"],"names":["getCliExecutionContext","spinner","uploadAssetFromFile","uploadAssetWithProgress","options","assetType","isInteractive","logToStderr","uploadOptions","uploadMessage","assetDocumentMessage","executionContext","isTTY","uploadProgress","start","assetDocumentProgress","assetDocumentStarted","lastReportedProgress","nextNonInteractiveCheckpoint","startAssetDocument","text","succeed","uploadController","AbortController","interruptUpload","abort","Error","handlesInterrupt","process","once","resumesInterruptInput","isSpinning","stdin","isRaw","readableFlowing","resume","asset","onProgress","percent","progress","Math","min","floor","checkpoint","signal","_id","error","activeProgress","stop","throwIfAborted","off","pause"],"mappings":"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"}

package/dist/actions/deploy/deployApp.js

@@ -5,7 +5,7 @@ import { exitCodes } from '@sanity/cli-core';
 import { getErrorMessage } from '@sanity/cli-core/errors';
 import { getCoreAppUrl } from '@sanity/cli-core/util';
 import { spinner } from '@sanity/cli-core/ux';
-import { createCoreApp, deployConfig, deployWorkbenchApp, getApplicationUrl, getWorkbench, resolveInstallationId, summarizeConfig } from '@sanity/workbench-cli/deploy';
+import { createCoreApp, deployConfig, deployWorkbenchApp, getApplicationUrl, getWorkbench, resolveInstallationId, summarizeConfig, toWorkbenchPayload } from '@sanity/workbench-cli/deploy';
 import { pack } from 'tar-fs';
 import { createDeployment, updateUserApplication } from '../../services/userApplications.js';
 import { getAppId } from '../../util/appId.js';
@@ -15,7 +15,7 @@ import { extractCoreAppManifest, readIconFromPath, resolveTitleUpdate } from '..
 import { createUserApplication } from './createUserApplication.js';
 import { checkAppId, checkAppTarget, checkAutoUpdates, checkBuild, checkPackageVersion, verifyOutputDir } from './deployChecks.js';
 import { deployDebug } from './deployDebug.js';
-import { listDeploymentFiles, reportExposes } from './deploymentPlan.js';
+import { listDeploymentFiles, reportInterfaces } from './deploymentPlan.js';
 import { runDeploy } from './deployRunner.js';
 import { findUserApplication } from './findUserApplication.js';
 const APP_PACKAGE = '@sanity/sdk-react';
@@ -83,6 +83,7 @@ export function deployApp(options) {
     });
     let application = null;
     let appCreated = false;
+    let workbenchApp;
     if (flags.external) {
         reporter.report({
             message: EXTERNAL_APP_NOT_SUPPORTED,
@@ -90,13 +91,13 @@ export function deployApp(options) {
             status: 'fail'
         });
     } else if (deployApplication && workbench) {
-        await checkAppTarget(reporter, {
+        workbenchApp = (await checkAppTarget(reporter, {
             appId,
             isWorkbenchApp: true,
             organizationId,
             slug: workbench.slug,
             title: appTitle
-        });
+        }))?.application;
     } else if (deployApplication) {
         ;
         ({ application, created: appCreated } = await resolveAppApplication(options, {
@@ -122,14 +123,16 @@ export function deployApp(options) {
     let applicationCreated = false;
     let rollbackApp;
     if (!dryRun && deployApplication && workbench && organizationId && !applicationId) {
-        ;
-        ({ applicationId, rollback: rollbackApp } = await createCoreApp({
+        const created = await createCoreApp({
             isSingleton: workbench.isSingleton,
             organizationId,
             slug: workbench.slug,
             title: appTitle,
             visibility: workbench.visibility
-        }));
+        });
+        workbenchApp = created.application;
+        applicationId = created.application.id;
+        rollbackApp = created.rollback;
         applicationCreated = true;
     }
     // A record created above is stranded at its slug (and blocks retries) if any
@@ -183,7 +186,6 @@ export function deployApp(options) {
             });
             config = summarizeConfig(workbench.config);
             reporter.report(installationId ? {
-                config,
                 message: config,
                 status: 'pass'
             } : {
@@ -193,12 +195,10 @@ export function deployApp(options) {
                 status: 'fail'
             });
         }
-        // Report the exposes deploying with the application, both modes.
-        const exposes = deployApplication && workbench ? reportExposes(reporter, workbench) : [];
+        const interfaces = deployApplication && workbench ? reportInterfaces(reporter, workbench) : null;
         // Surface the app's explicit singleton flag when set, both modes.
         if (deployApplication && workbench?.isSingleton !== undefined) {
             reporter.report({
-                isSingleton: workbench.isSingleton,
                 message: `Singleton: ${workbench.isSingleton}`,
                 status: 'pass'
             });
@@ -217,20 +217,33 @@ export function deployApp(options) {
                 });
             }
         };
+        const payload = {
+            appId: appId ?? null,
+            isAutoUpdating,
+            ...organizationId ? {
+                organizationId
+            } : {},
+            type: 'coreApp',
+            version,
+            ...toWorkbenchPayload(workbench, {
+                config,
+                interfaces,
+                title: appTitle
+            })
+        };
         // Dry run stops here — everything below mutates.
-        if (dryRun) return;
+        if (dryRun) return {
+            application: null,
+            payload
+        };
         // A config-only singleton ships no application, only its config.
         if (!deployApplication) {
             await deployApplicationConfig();
             if (installationId && version) {
                 return {
-                    applicationType: 'coreApp',
-                    applicationVersion: version,
-                    ...config ? {
-                        config
-                    } : {},
+                    application: null,
                     installationId,
-                    target: null
+                    payload
                 };
             }
             return;
@@ -272,24 +285,10 @@ export function deployApp(options) {
                 url
             });
             return {
-                applicationType: 'coreApp',
-                applicationVersion: version,
-                ...exposes.length > 0 ? {
-                    exposes
-                } : {},
-                ...workbench.isSingleton === undefined ? {} : {
-                    isSingleton: workbench.isSingleton
-                },
-                target: {
-                    action: applicationCreated ? 'create' : 'update',
-                    applicationId,
-                    // A redeploy targets an existing app; only a create reports the slug.
-                    ...applicationCreated ? {
-                        slug: workbench.slug
-                    } : {},
-                    title: appTitle,
-                    url
-                }
+                action: applicationCreated ? 'create' : 'update',
+                application: workbenchApp ?? null,
+                payload,
+                url
             };
         }
         // A real deploy has already exited if anything failed; landing here without a
@@ -317,14 +316,10 @@ export function deployApp(options) {
             title: application.title
         });
         return {
-            applicationType: 'coreApp',
-            applicationVersion: version,
-            target: {
-                action: appCreated ? 'create' : 'update',
-                applicationId: application.id,
-                title: application.title ?? null,
-                url: getCoreAppUrl(application.organizationId, application.id)
-            }
+            action: appCreated ? 'create' : 'update',
+            application,
+            payload,
+            url: getCoreAppUrl(application.organizationId, application.id)
         };
     } catch (err) {
         await rollbackApp?.();