@descix/cli 1.0.8 → 1.0.9

package/agent-assets/reference/platform-api-consumer.md

@@ -91,11 +91,17 @@ ASSET NOT FOUND at gs://... Upload it first with `descix app media-upload`.
 Both come back as `MEDIA_ASSET_UNREADABLE`. The first means you referenced the wrong app's asset;
 the second means you have not uploaded yet. Upload into the app that will do the asking.
 
-**The upload verb hands you both forms, and both work.** `descix app media-upload` returns a
-`path` (relative to the app's assets prefix) and a `ref` (the `gs://` URI) for every file, plus a
-`public_url`; `--json` prints them for scripting. Either `path` or `ref` is a valid `asset_ref` —
-so if a rule in your head says the tool's own `ref` field is unusable, the rule is wrong, not the
-tool.
+**The upload verb hands you the relative `path`, and it is a valid `asset_ref` as-is.** `descix
+app media-upload` returns, per file, a `path` (relative to the app's assets prefix), a
+`public_url` (the app-host form, e.g. `https://{app}.descix.net/assets/<path>`), `gcs_path` and
+`content_type`; `--json` prints them for scripting. Pass `path` (or a `gs://` URI you construct
+yourself) as `asset_ref` — either form works, see below.
+
+**Who can upload, and how much.** Any app owner, community admin or platform admin may call
+`media-upload` for that app. Storage is capped **200 MB per app today** (pending credit-based
+metering for more) — the cap is enforced server-side by `get_asset_upload_token`, which refuses
+with its own message when a would-be upload exceeds it; the CLI never pre-checks quota locally,
+so trust that refusal over any local math.
 
 **The `gs://` form is accepted.** A `gs://` URI works as an `asset_ref` — it is parsed and
 scope-checked, and the handler then looks the object up by path. What is PROVEN is the form and

package/bin/descix.js

@@ -40,35 +40,12 @@ import { kbVectorCell, kbCountSource } from '../lib/commands/kb-list-render.js';
 import * as corpusCommands from '../lib/commands/corpus.js';
 import * as modelConfigCommands from '../lib/commands/model-config.js';
 import { isHelpInvocation, getCommandSurface, applyVisibility } from '../lib/command-visibility.js';
+import { progress } from '../lib/output.js';
+import { runMediaUpload } from '../lib/commands/media-upload.js';
 import fs from 'fs/promises';
 import path from 'path';
 import os from 'os';
 
-
-/**
- * Emit human-facing PROGRESS for a command that can also emit JSON.
- *
- * When `--json` is set, stdout is a DATA CHANNEL: it must contain the JSON document and
- * nothing else, or every scripted consumer breaks. Progress then goes to stderr, where a
- * human piping stdout still sees it. Without `--json`, stdout is the human channel and
- * progress belongs there.
- *
- * ONE OWNER of that decision. Before this existed, each --json command re-decided it by
- * calling console.log directly, and both of them got it wrong: `mcp execute --json` prefixed
- * the document with "Executing <tool>..." and `app media-upload --json` prefixed it with a
- * header, a per-file listing and a per-file +/x line. Both exited 0, so a consumer saw a
- * success code and an unparseable stream. Measured 2026-08-21/22 (seat BEAST): two seats had
- * independently hand-rolled prefix-stripping workarounds (`tail -n +2`, `raw.find('[')`)
- * rather than reporting it.
- *
- * @param {Object} options - the command's parsed options (read for .json)
- * @param {...any} args - passed through to console.log / console.error
- */
-function progress(options, ...args) {
-  if (options && options.json) console.error(...args);
-  else console.log(...args);
-}
-
 /**
  * THE ONE OWNER of "a command threw, and the process must stop saying why".
  *
@@ -1196,15 +1173,12 @@ appCommand
 
 
 // descix app media-upload — upload media/asset files to an app's GCS assets prefix via the
-// API surface (WS-V1-PURGE Phase 1, item 2; media-via-API-surface PLATFORM half).
-// This is the canonical, filesystem-free way to get app media (podcast audio, cover art,
-// etc.) into the platform: request a short-lived signed PUT token from the API surface
-// (`get_asset_upload_token` over /apifront, user-session authed), upload each file straight
-// to GCS, and print the ASSET REFERENCES. An app microservice then fetches an uploaded asset
-// by reference over the Core broker via `get_app_asset` (no shared local filesystem needed).
+// API surface (WS-V1-PURGE Phase 1, item 2; media-via-API-surface PLATFORM half). Command body
+// lives in lib/commands/media-upload.js (runMediaUpload) — see that module for the full
+// contract (server-owned quota/path/permission checks, verbatim upload_headers ferrying).
 appCommand
   .command('media-upload')
-  .description('Upload media/asset files to an app\'s GCS assets prefix via the API surface (returns asset references)')
+  .description('Upload media/asset files to an app\'s GCS assets prefix (200 MB per app today; app owners, community admins and platform admins may upload — returns asset references)')
   .requiredOption('-a, --app <id>', 'App ID (community is resolved server-side from Products)')
   .requiredOption('-f, --file <path...>', 'One or more local file paths to upload')
   .option('--prefix <relPath>', 'Optional sub-path under the app assets/ prefix (e.g. "shows/myshow")', '')
@@ -1213,115 +1187,7 @@ appCommand
     try {
       const apiClient = new DeSciXApiClient();
       await requireAuth(apiClient);
-
-      const path = await import('path');
-      const mime = (await import('mime-types')).default;
-
-      const appId = options.app;
-      const localFiles = Array.isArray(options.file) ? options.file : [options.file];
-      const subPrefix = (options.prefix || '').replace(/^\/+|\/+$/g, '');
-
-      // Build the upload descriptor list: object path under assets/ = [subPrefix/]basename.
-      const fileDescriptors = [];
-      for (const localPath of localFiles) {
-        const abs = path.resolve(localPath);
-        let stat;
-        try {
-          stat = await fs.stat(abs);
-        } catch {
-          console.error(chalk.red(`\n❌ File not found: ${abs}\n`));
-          process.exit(1);
-        }
-        if (!stat.isFile()) {
-          console.error(chalk.red(`\n❌ Not a file: ${abs}\n`));
-          process.exit(1);
-        }
-        const base = path.basename(abs);
-        const objectPath = subPrefix ? `${subPrefix}/${base}` : base;
-        fileDescriptors.push({
-          path: objectPath,
-          content_type: mime.lookup(abs) || 'application/octet-stream',
-          size: stat.size,
-          _absolutePath: abs
-        });
-      }
-
-      console.log(chalk.cyan(`\n  Media Upload: ${appId} → GCS assets/\n`));
-      fileDescriptors.forEach(f => progress(options, chalk.gray(`  • ${f.path} (${(f.size / 1024).toFixed(1)}KB, ${f.content_type})`)));
-
-      // 1. Request a signed-PUT upload token over the API surface.
-      const tokenResponse = await apiClient.invoke('get_asset_upload_token', {
-        app_id: appId,
-        files: fileDescriptors.map(f => ({ path: f.path, content_type: f.content_type, size: f.size }))
-      });
-      const token = tokenResponse.message || tokenResponse;
-      const { signed_urls, objects } = token;
-
-      // 2. PUT each file directly to GCS using its signed URL.
-      progress(options, chalk.gray(`\n  Uploading ${fileDescriptors.length} file(s)...`));
-      const uploaded = [];
-      const errors = [];
-      for (const f of fileDescriptors) {
-        const signedUrl = signed_urls?.[f.path];
-        if (!signedUrl) {
-          errors.push(`No signed URL for: ${f.path}`);
-          progress(options, chalk.red(`  x ${f.path}`));
-          continue;
-        }
-        try {
-          const content = await fs.readFile(f._absolutePath);
-          const resp = await fetch(signedUrl, {
-            method: 'PUT',
-            headers: { 'Content-Type': f.content_type },
-            body: content
-          });
-          if (!resp.ok) {
-            errors.push(`Failed ${f.path}: ${resp.status} ${resp.statusText}`);
-            progress(options, chalk.red(`  x ${f.path}`));
-          } else {
-            const obj = (objects || []).find(o => o.path === f.path) || {};
-            // The asset REFERENCE an app handler / get_app_asset consumes: the gs:// URI.
-            const gcsRef = obj.gcs_path
-              ? `gs://${token.bucket}/${obj.gcs_path}`
-              : null;
-            uploaded.push({
-              path: f.path,
-              ref: gcsRef,
-              gcs_path: obj.gcs_path || null,
-              public_url: obj.public_url || null,
-              content_type: f.content_type,
-              size: f.size
-            });
-            progress(options, chalk.green(`  + ${f.path}`));
-          }
-        } catch (err) {
-          errors.push(`Error ${f.path}: ${err.message}`);
-          progress(options, chalk.red(`  x ${f.path}`));
-        }
-      }
-
-      if (errors.length > 0) {
-        progress(options, chalk.yellow(`\n  ${errors.length} error(s):`));
-        errors.forEach(e => progress(options, chalk.red(`  - ${e}`)));
-      }
-
-      if (uploaded.length === 0) {
-        console.error(chalk.red('\n❌ No files uploaded.\n'));
-        process.exit(1);
-      }
-
-      if (options.json) {
-        console.log('\n' + JSON.stringify({ app_id: appId, assets: uploaded }, null, 2) + '\n');
-      } else {
-        console.log(chalk.green(`\n  ✅ Uploaded ${uploaded.length} asset(s).\n`));
-        console.log(chalk.cyan('  Asset references (pass these to your app handler; the service fetches via get_app_asset):'));
-        uploaded.forEach(u => {
-          console.log(chalk.white(`    ${u.path}`));
-          console.log(chalk.gray(`      ref:        ${u.ref}`));
-          console.log(chalk.gray(`      public_url: ${u.public_url}`));
-        });
-        console.log();
-      }
+      await runMediaUpload(apiClient, options);
     } catch (error) {
       console.error(chalk.red(`\n❌ ${error.message}\n`));
       process.exit(1);

package/lib/commands/media-upload.js

@@ -0,0 +1,176 @@
+/**
+ * `descix app media-upload` — upload media/asset files to an app's GCS assets prefix via the
+ * API surface (WS-V1-PURGE Phase 1, item 2; media-via-API-surface PLATFORM half; storage-cap
+ * ferrying added WS-MEDIA-QUOTA per CEO ruling 2026-09-16: "Yes you can build with a 200MB
+ * size limit for now until we get credit based metering for more storage.").
+ *
+ * This is the canonical, filesystem-free way to get app media (podcast audio, cover art, etc.)
+ * into the platform: request a short-lived signed PUT token from the API surface
+ * (`get_asset_upload_token` over /apifront, user-session authed), upload each file straight to
+ * GCS, and print the server's asset references. An app microservice then fetches an uploaded
+ * asset by reference over the Core broker via `get_app_asset` (no shared local filesystem
+ * needed). App owners, community admins and platform admins may upload — the server is the
+ * sole authority on that and on the app's storage quota (200 MB per app today; nothing here
+ * pre-validates either).
+ *
+ * SERVER IS THE SOLE AUTHORITY (super-DRY: never re-derive a server-owned fact client-side):
+ * - quota, path validity (no leading `/`, no backslash, no empty/`.`/`..` segment) and caller
+ *   permission are enforced ONLY by `get_asset_upload_token`; a refusal there throws with the
+ *   server's message verbatim (`DeSciXApiClient#invoke`) and this module does not catch it —
+ *   let it propagate so the caller prints exactly what the server said and exits non-zero.
+ * - `--prefix` is passed through UNCHANGED (no slash-stripping): stripping could silently mask
+ *   a server-side path refusal the server is best positioned to name.
+ * - Each file is PUT with the server's `upload_headers[path]` bag VERBATIM (precedent: `site
+ *   upload`'s `ferriedHeaders` — the server binds Content-Type and
+ *   `x-goog-content-length-range` into the v4 signed-URL signature, so a re-derived header
+ *   403s). Size is still read from `fs.stat`, since GCS itself rejects a body whose length
+ *   disagrees with the declared range.
+ * - `public_url` and `storage` are printed exactly as the server returned them — never
+ *   reconstructed from `bucket` + `gcs_path` (that WAS a client-side re-derivation of a server
+ *   fact; removed here rather than perpetuated).
+ */
+
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import chalk from 'chalk';
+import { progress } from '../output.js';
+
+/**
+ * Run `app media-upload`.
+ *
+ * @param {import('../api-client.js').DeSciXApiClient} apiClient
+ * @param {{app:string, file:string|string[], prefix?:string, json?:boolean}} options
+ * @returns {Promise<{app_id:string, assets:Array<object>, storage:object|null}>}
+ */
+export async function runMediaUpload(apiClient, options) {
+  const mime = (await import('mime-types')).default;
+
+  const appId = options.app;
+  const localFiles = Array.isArray(options.file) ? options.file : [options.file];
+  // No local normalization: a leading/trailing slash, empty segment, or `.`/`..` segment is a
+  // server-owned validity rule (get_asset_upload_token) — pass --prefix through untouched so a
+  // bad prefix surfaces as the server's own refusal, never a silently-corrected local guess.
+  const subPrefix = options.prefix || '';
+
+  // Build the upload descriptor list: object path under assets/ = [subPrefix/]basename.
+  const fileDescriptors = [];
+  for (const localPath of localFiles) {
+    const abs = path.resolve(localPath);
+    let stat;
+    try {
+      stat = await fs.stat(abs);
+    } catch {
+      throw new Error(`File not found: ${abs}`);
+    }
+    if (!stat.isFile()) {
+      throw new Error(`Not a file: ${abs}`);
+    }
+    const base = path.basename(abs);
+    const objectPath = subPrefix ? `${subPrefix}/${base}` : base;
+    fileDescriptors.push({
+      path: objectPath,
+      content_type: mime.lookup(abs) || 'application/octet-stream',
+      size: stat.size,
+      _absolutePath: abs
+    });
+  }
+
+  progress(options, chalk.cyan(`\n  Media Upload: ${appId} → GCS assets/\n`));
+  fileDescriptors.forEach(f => progress(options, chalk.gray(`  • ${f.path} (${(f.size / 1024).toFixed(1)}KB, ${f.content_type})`)));
+
+  // 1. Request a signed-PUT upload token over the API surface. The server owns quota, path
+  // validity and caller permission — a refusal here throws with the server's message verbatim
+  // and this function does not catch it.
+  const tokenResponse = await apiClient.invoke('get_asset_upload_token', {
+    app_id: appId,
+    files: fileDescriptors.map(f => ({ path: f.path, content_type: f.content_type, size: f.size }))
+  });
+  const token = tokenResponse.message || tokenResponse;
+  const { signed_urls, upload_headers, objects, storage } = token;
+
+  // 2. PUT each file directly to GCS using its signed URL and the server's exact header bag.
+  progress(options, chalk.gray(`\n  Uploading ${fileDescriptors.length} file(s)...`));
+  const uploaded = [];
+  const errors = [];
+  for (const f of fileDescriptors) {
+    const signedUrl = signed_urls?.[f.path];
+    if (!signedUrl) {
+      errors.push(`No signed URL for: ${f.path}`);
+      progress(options, chalk.red(`  x ${f.path}`));
+      continue;
+    }
+    // Never re-derive Content-Type (or the length-range header) locally for the PUT — the
+    // server binds them into the v4 signature. A path the server did not ferry a header bag
+    // for is an error for that path, naming the server as the thing that is missing it.
+    const headers = upload_headers?.[f.path];
+    if (!headers) {
+      errors.push(
+        `No upload_headers for: ${f.path} (get_asset_upload_token response is missing the header ` +
+        `bag for this path)`
+      );
+      progress(options, chalk.red(`  x ${f.path}`));
+      continue;
+    }
+    try {
+      const content = await fs.readFile(f._absolutePath);
+      const resp = await fetch(signedUrl, {
+        method: 'PUT',
+        headers,
+        body: content
+      });
+      if (!resp.ok) {
+        errors.push(`Failed ${f.path}: ${resp.status} ${resp.statusText}`);
+        progress(options, chalk.red(`  x ${f.path}`));
+      } else {
+        const obj = (objects || []).find(o => o.path === f.path) || {};
+        uploaded.push({
+          path: f.path,
+          gcs_path: obj.gcs_path || null,
+          public_url: obj.public_url || null,
+          content_type: f.content_type,
+          size: f.size
+        });
+        progress(options, chalk.green(`  + ${f.path}`));
+      }
+    } catch (err) {
+      errors.push(`Error ${f.path}: ${err.message}`);
+      progress(options, chalk.red(`  x ${f.path}`));
+    }
+  }
+
+  if (errors.length > 0) {
+    progress(options, chalk.yellow(`\n  ${errors.length} error(s):`));
+    errors.forEach(e => progress(options, chalk.red(`  - ${e}`)));
+  }
+
+  if (uploaded.length === 0) {
+    throw new Error('No files uploaded.');
+  }
+  if (errors.length > 0) {
+    // FAIL LOUD on a partial upload: the files that went up are listed above, but a caller that
+    // reads only the exit status must not take a half-uploaded set as success.
+    throw new Error(`${errors.length} of ${fileDescriptors.length} file(s) failed to upload:\n  - ${errors.join('\n  - ')}`);
+  }
+
+  const result = { app_id: appId, assets: uploaded, storage: storage || null };
+
+  if (options.json) {
+    console.log('\n' + JSON.stringify(result, null, 2) + '\n');
+  } else {
+    console.log(chalk.green(`\n  ✅ Uploaded ${uploaded.length} asset(s).\n`));
+    console.log(chalk.cyan('  Asset references (pass the path to your app handler; the service fetches via get_app_asset):'));
+    uploaded.forEach(u => {
+      console.log(chalk.white(`    ${u.path}`));
+      console.log(chalk.gray(`      public_url: ${u.public_url}`));
+    });
+    if (result.storage) {
+      // projected_bytes is the app's total INCLUDING this upload; used_bytes is the total before it.
+      const usedMb = (result.storage.projected_bytes / (1024 * 1024)).toFixed(1);
+      const limitMb = (result.storage.limit_bytes / (1024 * 1024)).toFixed(1);
+      console.log(chalk.gray(`\n  Storage: ${usedMb} MB / ${limitMb} MB used`));
+    }
+    console.log();
+  }
+
+  return result;
+}

package/lib/output.js

@@ -0,0 +1,31 @@
+/**
+ * CLI output — ONE OWNER of the "human progress vs. --json data channel" split.
+ *
+ * Relocated from bin/descix.js (WS-MEDIA-QUOTA) so lib/commands/* modules can share it
+ * without bin/ -> lib/ layering going backwards. This is a move, not a duplication: bin/descix.js
+ * imports `progress` from here instead of defining its own copy.
+ */
+
+/**
+ * Emit human-facing PROGRESS for a command that can also emit JSON.
+ *
+ * When `--json` is set, stdout is a DATA CHANNEL: it must contain the JSON document and
+ * nothing else, or every scripted consumer breaks. Progress then goes to stderr, where a
+ * human piping stdout still sees it. Without `--json`, stdout is the human channel and
+ * progress belongs there.
+ *
+ * ONE OWNER of that decision. Before this existed, each --json command re-decided it by
+ * calling console.log directly, and both of them got it wrong: `mcp execute --json` prefixed
+ * the document with "Executing <tool>..." and `app media-upload --json` prefixed it with a
+ * header, a per-file listing and a per-file +/x line. Both exited 0, so a consumer saw a
+ * success code and an unparseable stream. Measured 2026-08-21/22 (seat BEAST): two seats had
+ * independently hand-rolled prefix-stripping workarounds (`tail -n +2`, `raw.find('[')`)
+ * rather than reporting it.
+ *
+ * @param {Object} options - the command's parsed options (read for .json)
+ * @param {...any} args - passed through to console.log / console.error
+ */
+export function progress(options, ...args) {
+  if (options && options.json) console.error(...args);
+  else console.log(...args);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@descix/cli",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "DeSciX CLI and MCP Server - Unified command-line interface for DeSciX platform",
   "repository": {
     "type": "git",