@302ai/media-studio-cli 0.1.1 → 0.1.2-beta.1

package/README.md

@@ -215,7 +215,7 @@ The CLI mirrors the web composer's upload flow:
 1. Validates each referenced file locally (exists, readable, supported extension, under 50 MB) before any network call.
 2. Uploads each file via the web app's `POST /api/chat/attachments` endpoint with a terminal spinner (`Uploading attachment 1/2: cover.png`).
 3. Rewrites the prompt to inline the remote URL using the web's `&&<url>&&` marker, which the upstream model and web session history natively understand.
-4. Up to 5 unique attachments per turn (same as the web composer); referencing the same file twice uploads it once.
+4. Up to 10 unique attachments per turn (same as the web composer); referencing the same file twice uploads it once.
 5. An unattachable reference (missing file, unsupported format) fails the turn before any session is provisioned.
 6. Prose mentions (`@team 辛苦了`, email addresses) stay literal text — only tokens with a file extension or path slash are treated as attachments.
 7. `@path` is local-filesystem-only: `@https://example.com/a.png` fails with `no such file`. There is no `@url` form — remote URLs are not attachments.

package/dist/index.js

@@ -4284,7 +4284,7 @@ var consola = createConsola2();
 // package.json
 var package_default = {
   name: "@302ai/media-studio-cli",
-  version: "0.1.1",
+  version: "0.1.2-beta.1",
   description: "CLI for AI Media Studio — let external agents drive the core media-studio features",
   author: "302.AI",
   license: "Apache-2.0",
@@ -9648,7 +9648,7 @@ var ArtifactItemSchema = object({
 var ArtifactItemsSchema = array(ArtifactItemSchema);
 
 // ../media-studio-contract/src/attachments/constants.ts
-var MAX_ATTACHMENT_COUNT = 5;
+var MAX_ATTACHMENT_COUNT = 10;
 var MAX_ATTACHMENT_BYTES = 50 * 1024 * 1024;
 var ATTACHMENT_MIME_BY_EXTENSION = {
   png: "image/png",
@@ -10058,6 +10058,17 @@ var MEDIA_STUDIO_URLS = {
   cn: "https://media.302ai.cn",
   staging: "https://media.tool302.com"
 };
+var OSS_GLOBAL_ORIGIN = "https://sonier-file-oss.small-base-aaeb.workers.dev";
+var OSS_CN_ORIGIN = "https://sonier.oss-cn-shenzhen.aliyuncs.com";
+function resolveOssUrl(url, useCnDomain) {
+  if (!useCnDomain || !url.startsWith(OSS_GLOBAL_ORIGIN))
+    return url;
+  const suffix = url.slice(OSS_GLOBAL_ORIGIN.length);
+  const boundary = suffix[0];
+  if (boundary && !"/?#".includes(boundary))
+    return url;
+  return OSS_CN_ORIGIN + suffix;
+}
 var MEDIA_STUDIO_HOSTS = [
   new URL(MEDIA_STUDIO_URLS.default).hostname,
   new URL(MEDIA_STUDIO_URLS.cn).hostname,
@@ -10073,6 +10084,34 @@ var APP_ENV_HOSTS = {
   ]
 };
 
+// ../media-studio-contract/src/model-flag.ts
+var MODEL_FLAG_BLOCK_RE = /\$(?=\s*--model\b)([^$]+)\$/gi;
+var MODEL_FLAG_HEAD_RE = /^--model\s+("(?:[^"\\]|\\.)+"|[^\s]+)/i;
+function findModelFlagMatches(text) {
+  const pattern = new RegExp(MODEL_FLAG_BLOCK_RE.source, "gi");
+  return Array.from(text.matchAll(pattern)).flatMap((match) => {
+    const start = match.index;
+    const body = match[1]?.trim();
+    if (start === undefined || !body)
+      return [];
+    const token = body.match(MODEL_FLAG_HEAD_RE)?.[1];
+    if (!token)
+      return [];
+    let modelId = token;
+    if (token.startsWith('"')) {
+      try {
+        const decoded = JSON.parse(token);
+        if (typeof decoded !== "string")
+          return [];
+        modelId = decoded;
+      } catch {
+        return [];
+      }
+    }
+    return [{ start, end: start + match[0].length, body, modelId }];
+  });
+}
+
 // ../media-studio-contract/src/skills/activation.ts
 var SKILL_ACTIVATION_MARKER = "%%";
 var SKILL_ACTIVATION_RE = /%%(\/[^%\s]+)%%/g;
@@ -10102,21 +10141,20 @@ function findSkillActivationMatches(text) {
 
 // ../media-studio-contract/src/sessions/derive-first-turn-note.ts
 var DEFAULT_FALLBACK_TITLE = "Agent Task";
-var MAX_NOTE_LENGTH = 64;
+var MAX_PROJECT_TITLE_LENGTH = 64;
+function clampSessionTitle(title) {
+  return Array.from(title).slice(0, MAX_PROJECT_TITLE_LENGTH).join("");
+}
 function deriveFirstTurnNote(rawText, options) {
   const fallback = options?.fallbackTitle ?? DEFAULT_FALLBACK_TITLE;
   if (!rawText) {
     return fallback;
   }
-  const unwrapped = rawText.replace(/\$--model\s+"([^"$]+)"[^$]*\$/gi, "$1 ").replace(/\$--model\s+([^$\s]+)[^$]*\$/gi, "$1 ").replace(SKILL_ACTIVATION_RE, "$1").replace(ATTACHMENT_MARKER_REGEX, "$1").replace(/\s+/g, " ").trim();
+  const unwrapped = findModelFlagMatches(rawText).toReversed().reduce((text, match) => `${text.slice(0, match.start)}${match.modelId} ${text.slice(match.end)}`, rawText).replace(SKILL_ACTIVATION_RE, "$1").replace(ATTACHMENT_MARKER_REGEX, "$1").replace(/\s+/g, " ").trim();
   if (!unwrapped) {
     return fallback;
   }
-  const codePoints = Array.from(unwrapped);
-  if (codePoints.length > MAX_NOTE_LENGTH) {
-    return codePoints.slice(0, MAX_NOTE_LENGTH).join("");
-  }
-  return unwrapped;
+  return clampSessionTitle(unwrapped);
 }
 
 // ../media-studio-contract/src/skills/compose-turn.ts
@@ -16975,7 +17013,7 @@ function saveConfigFile(data) {
   const dir = getConfigDir();
   mkdirSync(dir, { recursive: true });
   const configPath = getConfigFilePath();
-  const tmpPath = `${configPath}.${nanoid3()}.tmp`;
+  const tmpPath = `${configPath}.tmp.${process.pid}.${nanoid3()}`;
   writeFileSync(tmpPath, JSON.stringify(data, null, 2), "utf8");
   chmodSync(tmpPath, 384);
   renameSync(tmpPath, configPath);
@@ -17541,6 +17579,12 @@ class MediaStudioClient {
     }, MeResponseSchema, (status) => `Authentication verification failed with status ${status}`);
   }
 }
+function createCliClient(options) {
+  return new MediaStudioClient({
+    baseUrl: options?.baseUrl ?? resolveApiBaseUrl(),
+    apiKey: options?.apiKey ?? resolveApiKey()
+  });
+}
 // src/client/tool-formatter.ts
 var ASPECT_RATIO_PATTERN = /aspect_ratio:\s*([^\s,;]+)/i;
 var MODEL_PATTERN = /(?:^|\n)\s*-\s*model:\s*([^\s,;]+)/i;
@@ -17903,6 +17947,26 @@ function reportCommandError(err, options) {
   process.exit(1);
 }
 
+// src/lib/open-url.ts
+var OPEN_URL_NOTE = "Open or render open_url. Submit or forward url unchanged.";
+function loginUsesCnOss(apiBaseUrl) {
+  try {
+    return new URL(apiBaseUrl).origin === MEDIA_STUDIO_URLS.cn;
+  } catch {
+    return false;
+  }
+}
+function resolveOpenUrl(url, apiBaseUrl) {
+  return resolveOssUrl(url, loginUsesCnOss(apiBaseUrl));
+}
+function deriveOpenUrl(rawUrl, apiBaseUrl) {
+  const sanitized = rawUrl?.replace(/\r?\n/g, " ").trim();
+  if (!sanitized)
+    return;
+  const openUrl = resolveOpenUrl(sanitized, apiBaseUrl);
+  return openUrl === sanitized ? undefined : openUrl;
+}
+
 // src/lib/spinner.ts
 var import_picocolors = __toESM(require_picocolors(), 1);
 var BRAILLE_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
@@ -18065,7 +18129,7 @@ async function resolvePromptAttachments(options) {
     typed: typedByResolved[abs] ?? abs,
     file: await readAttachment(typedByResolved[abs] ?? abs, abs)
   })));
-  const client = new MediaStudioClient({
+  const client = createCliClient({
     baseUrl: options.apiBaseUrl,
     apiKey: options.apiKey
   });
@@ -18129,7 +18193,7 @@ class SessionNotFoundError extends Error {
   }
 }
 async function ensureSessionExists(options) {
-  const client = new MediaStudioClient({
+  const client = createCliClient({
     baseUrl: options.apiBaseUrl,
     apiKey: options.apiKey
   });
@@ -18149,7 +18213,7 @@ function finalizeProvision(result, spinner) {
   return result.sessionId;
 }
 async function provisionSession(options) {
-  const client = new MediaStudioClient({
+  const client = createCliClient({
     baseUrl: options.apiBaseUrl,
     apiKey: options.apiKey
   });
@@ -18227,7 +18291,7 @@ async function resolvePromptSkills(options) {
   if (spans.length === 0) {
     return { text: options.prompt, skillUrls: [], autoEnabled: [] };
   }
-  const client = new MediaStudioClient({
+  const client = createCliClient({
     baseUrl: options.apiBaseUrl,
     apiKey: options.apiKey
   });
@@ -18266,7 +18330,11 @@ var PROVISION_STAGE_LABELS = {
   skills: "Installing skills...",
   finishing: "Finishing session setup..."
 };
-function printTerminalMediaAssets(mediaAssets, fullText) {
+function withMediaOpenUrl(asset, apiBaseUrl) {
+  const openUrl = deriveOpenUrl(asset.resultUrl, apiBaseUrl);
+  return openUrl ? { ...asset, openUrl } : asset;
+}
+function printTerminalMediaAssets(mediaAssets, fullText, apiBaseUrl) {
   if (mediaAssets.length === 0) {
     if (fullText && !fullText.endsWith(`
 `)) {
@@ -18283,13 +18351,20 @@ function printTerminalMediaAssets(mediaAssets, fullText) {
   process.stdout.write(`
 === MEDIA ASSETS ===
 `);
+  let noted = false;
   for (const asset of mediaAssets) {
+    const openUrl = deriveOpenUrl(asset.resultUrl, apiBaseUrl);
+    noted ||= Boolean(openUrl);
     process.stdout.write(`- type: ${asset.domain ?? "media"}
 ` + (asset.resultUrl ? `- url: ${asset.resultUrl}
+` : "") + (openUrl ? `- open_url: ${openUrl}
 ` : "") + (asset.modelUsed ? `- model: ${asset.modelUsed}
 ` : "") + (asset.taskId ? `- task_id: ${asset.taskId}
 ` : ""));
   }
+  if (noted)
+    process.stdout.write(`${OPEN_URL_NOTE}
+`);
   process.stdout.write(`====================
 `);
 }
@@ -18348,11 +18423,11 @@ function describeStreamFailure(err) {
   return String(err);
 }
 async function streamTurn(options) {
-  const { args, sessionId, spinner, autoEnabled, attachments } = options;
+  const { args, sessionId, spinner, autoEnabled, attachments, apiBaseUrl } = options;
   if (!args.json) {
     spinner.start("Connecting to Media Studio...");
   }
-  const stream = await new MediaStudioClient({
+  const stream = await createCliClient({
     baseUrl: options.apiBaseUrl,
     apiKey: options.apiKey
   }).chat.stream({
@@ -18435,7 +18510,7 @@ async function streamTurn(options) {
             sessionId,
             text: fullText,
             steps,
-            media: mediaAssets,
+            media: mediaAssets.map((asset) => withMediaOpenUrl(asset, apiBaseUrl)),
             ...attachments.length > 0 ? { attachments } : {},
             ...autoEnabled.length > 0 ? { autoEnabled } : {},
             ...args["show-reasoning"] && reasoning ? { reasoning } : {}
@@ -18445,7 +18520,7 @@ async function streamTurn(options) {
           emitting = false;
           return;
         }
-        printTerminalMediaAssets(mediaAssets, fullText);
+        printTerminalMediaAssets(mediaAssets, fullText, apiBaseUrl);
         process.stdout.write(`session: ${sessionId}
 `);
         emitting = false;
@@ -18469,7 +18544,7 @@ async function streamTurn(options) {
         sessionId,
         text: fullText,
         steps,
-        media: mediaAssets,
+        media: mediaAssets.map((asset) => withMediaOpenUrl(asset, apiBaseUrl)),
         ...attachments.length > 0 ? { attachments } : {},
         ...autoEnabled.length > 0 ? { autoEnabled } : {},
         ...args["show-reasoning"] && reasoning ? { reasoning } : {}
@@ -18477,7 +18552,7 @@ async function streamTurn(options) {
       process.stdout.write(`${JSON.stringify(output, null, 2)}
 `);
     } else {
-      printTerminalMediaAssets(mediaAssets, fullText);
+      printTerminalMediaAssets(mediaAssets, fullText, apiBaseUrl);
       process.stdout.write(`session: ${sessionId}
 `);
     }
@@ -18608,7 +18683,7 @@ var chatCommand = defineCommand({
       const shouldPatchNote = Boolean(explicitSessionDetail && !explicitSessionDetail.titleCustomized && explicitSessionDetail.isEmpty || !args.session && !args.new && readLastSessionPendingNote());
       if (shouldPatchNote) {
         const derivedNote = deriveFirstTurnNote(buildNotePrompt(promptWithAttachments, attachments), { fallbackTitle: CLI_DEFAULT_SESSION_NOTE });
-        new MediaStudioClient({
+        createCliClient({
           baseUrl: apiBaseUrl,
           apiKey: resolveApiKey()
         }).sessions.updateNote(resolved.sessionId, derivedNote).then(() => clearLastSessionPendingNote()).catch(() => {});
@@ -18714,7 +18789,7 @@ ${getAvailableRegions().map((r) => `      ${r.key.padEnd(8)} - ${r.url} (${r.des
 
     The CLI validates files locally (existence, supported format, under 50 MB),
     uploads them with progress indication, and inlines remote URLs into the prompt.
-    Up to 5 attachments per turn. Referencing the same file multiple times
+    Up to 10 attachments per turn. Referencing the same file multiple times
     uploads it only once. Plain prose mentions (@team) and emails are ignored.
 
     @path is local-filesystem-only: @https://example.com/a.png fails with
@@ -18768,7 +18843,9 @@ ${getAvailableRegions().map((r) => `      ${r.key.padEnd(8)} - ${r.url} (${r.des
 
   msc sessions artifacts <session-id>
     List all generated assets (images, videos, audio) produced in that session,
-    including download URLs and model metadata.
+    including download URLs and model metadata. Text output adds an OPEN column
+    only when the signed-in site needs a different origin; JSON adds the openUrl
+    field in the same case. Submit or forward the link unchanged.
 
   msc sessions use <session-id>
     Switch your active session pointer to an existing session. The id is
@@ -18802,7 +18879,8 @@ ${getAvailableRegions().map((r) => `      ${r.key.padEnd(8)} - ${r.url}`).join(`
           "status": "completed",
           "domain": "image",       // "image" | "video" | etc.
           "operation": "t2i",      // "t2i", "t2v", etc.
-          "resultUrl": "https://...",
+          "resultUrl": "https://...", // stored address; submit this unchanged
+          "openUrl": "https://...",    // present only when rendering needs another origin
           "modelUsed": "string",
           "taskId": "string"
         }
@@ -18818,8 +18896,17 @@ ${getAvailableRegions().map((r) => `      ${r.key.padEnd(8)} - ${r.url}`).join(`
       "reasoning": "string?"       // present if --show-reasoning was passed
     }
 
-  Extracting the result URL (e.g. with jq):
-    url=$(msc chat "a red balloon" --json | jq -r '.media[0].resultUrl')
+  resultUrl is the stored address. Submit or forward it unchanged. openUrl is
+  present only when the signed-in site needs a different origin to render the
+  object. Text output names that address open_url and adds one fixed note;
+  JSON does not contain the note.
+
+  Extracting each role (e.g. with jq):
+    result=$(msc chat "a red balloon" --json)
+    url=$(printf '%s
+' "$result" | jq -r '.media[0].resultUrl')
+    open=$(printf '%s
+' "$result" | jq -r '.media[0].openUrl // .media[0].resultUrl')
 
   Exit codes: 0 = the turn ran to completion OR its stream ended early; 1 =
   \`status: "error"\`, a usage error, or any other failure. Only what the parser
@@ -18901,6 +18988,7 @@ ${getAvailableRegions().map((r) => `      ${r.key.padEnd(8)} - ${r.url}`).join(`
     msc sessions --json              # list: [{ sessionId, note, ... }]
     msc sessions use <id> --json     # { "sessionId": "string" }
     msc sessions use --new --json    # { "sessionId": "string" } (newly created)
+    msc sessions artifacts <id> --json # [{..., link, openUrl?}]
     \`--session\`/\`use <id>\` verify the id upstream; an unknown id exits 1 with
     the \`--new\` hint and leaves the default session untouched.
 
@@ -20764,9 +20852,24 @@ var logoutCommand = defineCommand({
   }
 });
 
+// src/lib/run-command.ts
+async function runCliCommand(fn, options) {
+  try {
+    await fn();
+  } catch (err) {
+    if (isTransportFailure(err))
+      throw err;
+    reportCommandError(err, { json: options?.json });
+    return;
+  }
+}
+
 // src/commands/sessions.ts
 function formatLastActive(iso) {
-  return iso.replace("T", " ").slice(0, 19);
+  const date = new Date(iso);
+  if (!iso || Number.isNaN(date.getTime()))
+    return "";
+  return date.toLocaleString("sv-SE", { hour12: false }).replace(", ", " ");
 }
 function renderSessionsTable(sessions, currentSessionId) {
   const rows = sessions.map((s) => ({
@@ -20792,27 +20895,31 @@ ${bodyLines.join(`
 `)}
 `;
 }
-function resolveClient() {
-  const apiKey = resolveApiKey();
-  const apiBaseUrl = resolveApiBaseUrl();
-  return new MediaStudioClient({ baseUrl: apiBaseUrl, apiKey });
-}
-function renderArtifactsTable(artifacts) {
-  const rows = artifacts.map((a) => ({
-    type: a.type,
-    status: a.status,
-    title: a.title ? a.title.replace(/\r?\n/g, " ").trim() || "-" : "-",
-    link: a.link ? a.link.replace(/\r?\n/g, " ").trim() || "-" : "-"
-  }));
+function artifactRows(artifacts, apiBaseUrl) {
+  return artifacts.map((a) => {
+    const link = a.link ? a.link.replace(/\r?\n/g, " ").trim() || "-" : "-";
+    const openUrl = link === "-" ? undefined : deriveOpenUrl(link, apiBaseUrl);
+    return {
+      type: a.type,
+      status: a.status,
+      title: a.title ? a.title.replace(/\r?\n/g, " ").trim() || "-" : "-",
+      link,
+      openUrl: openUrl ?? ""
+    };
+  });
+}
+function renderArtifactsTable(rows) {
+  const showOpen = rows.some((row) => row.openUrl);
   const headers = {
     type: "TYPE",
     status: "STATUS",
     title: "TITLE",
-    link: "LINK"
+    link: "LINK",
+    openUrl: "OPEN"
   };
   const typeWidth = Math.max(headers.type.length, ...rows.map((r) => r.type.length));
   const statusWidth = Math.max(headers.status.length, ...rows.map((r) => r.status.length));
-  const formatRow = (r) => `${r.type.padEnd(typeWidth)}  ${r.status.padEnd(statusWidth)}  ${r.title}  ${r.link}`;
+  const formatRow = (r) => `${r.type.padEnd(typeWidth)}  ${r.status.padEnd(statusWidth)}  ${r.title}  ${r.link}${showOpen ? `  ${r.openUrl}` : ""}`;
   return `${formatRow(headers)}
 ${rows.map(formatRow).join(`
 `)}
@@ -20830,27 +20937,21 @@ var listSessionsCommand = defineCommand({
       description: "Output machine-readable JSON array"
     }
   },
-  run: async ({ args }) => {
-    try {
-      const client = resolveClient();
-      const response = await client.sessions.list();
-      if (args.json) {
-        process.stdout.write(`${JSON.stringify(response.data, null, 2)}
+  run: ({ args }) => runCliCommand(async () => {
+    const client = createCliClient();
+    const response = await client.sessions.list();
+    if (args.json) {
+      process.stdout.write(`${JSON.stringify(response.data, null, 2)}
 `);
-        return;
-      }
-      if (response.data.length === 0) {
-        consola.info("No sessions found.");
-        return;
-      }
-      const currentId = readLastSessionId();
-      consola.log(renderSessionsTable(response.data, currentId));
-    } catch (err) {
-      if (isTransportFailure(err))
-        throw err;
-      reportCommandError(err, { json: args.json });
+      return;
     }
-  }
+    if (response.data.length === 0) {
+      consola.info("No sessions found.");
+      return;
+    }
+    const currentId = readLastSessionId();
+    consola.log(renderSessionsTable(response.data, currentId));
+  }, { json: args.json })
 });
 var artifactsCommand = defineCommand({
   meta: {
@@ -20869,28 +20970,30 @@ var artifactsCommand = defineCommand({
       description: "Output machine-readable JSON array"
     }
   },
-  run: async ({ args }) => {
-    try {
-      const client = resolveClient();
-      const response = await client.sessions.artifacts({
-        sessionId: args.sessionId
+  run: ({ args }) => runCliCommand(async () => {
+    const client = createCliClient();
+    const response = await client.sessions.artifacts({
+      sessionId: args.sessionId
+    });
+    if (args.json) {
+      const apiBaseUrl = resolveApiBaseUrl();
+      const data = response.data.map((item) => {
+        const openUrl = deriveOpenUrl(item.link, apiBaseUrl);
+        return openUrl ? { ...item, openUrl } : item;
       });
-      if (args.json) {
-        process.stdout.write(`${JSON.stringify(response.data, null, 2)}
+      process.stdout.write(`${JSON.stringify(data, null, 2)}
 `);
-        return;
-      }
-      if (response.data.length === 0) {
-        consola.info("No artifacts found.");
-        return;
-      }
-      consola.log(renderArtifactsTable(response.data));
-    } catch (err) {
-      if (isTransportFailure(err))
-        throw err;
-      reportCommandError(err, { json: args.json });
+      return;
     }
-  }
+    if (response.data.length === 0) {
+      consola.info("No artifacts found.");
+      return;
+    }
+    const rows = artifactRows(response.data, resolveApiBaseUrl());
+    consola.log(renderArtifactsTable(rows));
+    if (rows.some((row) => row.openUrl))
+      consola.log(OPEN_URL_NOTE);
+  }, { json: args.json })
 });
 var useSessionCommand = defineCommand({
   meta: {
@@ -20913,50 +21016,44 @@ var useSessionCommand = defineCommand({
       description: "Output machine-readable JSON: { sessionId }"
     }
   },
-  run: async ({ args }) => {
-    try {
-      const sessionId = args.sessionId;
-      const apiBaseUrl = resolveApiBaseUrl();
-      if (args.new) {
-        if (sessionId) {
-          throw new Error("--new and <session-id> cannot be combined: pass one, not both.");
-        }
-        const result = await provisionSession({
-          apiBaseUrl,
-          apiKey: resolveApiKey(),
-          note: CLI_DEFAULT_SESSION_NOTE
-        });
-        const created = finalizeProvision(result);
-        saveLastSessionId(created, { pendingNote: true });
-        if (args.json) {
-          process.stdout.write(`${JSON.stringify({ sessionId: created })}
-`);
-          return;
-        }
-        consola.success(`Created and switched to session ${created}`);
-        return;
+  run: ({ args }) => runCliCommand(async () => {
+    const sessionId = args.sessionId;
+    const apiBaseUrl = resolveApiBaseUrl();
+    if (args.new) {
+      if (sessionId) {
+        throw new Error("--new and <session-id> cannot be combined: pass one, not both.");
       }
-      if (!sessionId) {
-        throw new Error("Pass the session id to switch to, or --new to create a new session.");
-      }
-      await ensureSessionExists({
+      const result = await provisionSession({
         apiBaseUrl,
         apiKey: resolveApiKey(),
-        sessionId
+        note: CLI_DEFAULT_SESSION_NOTE
       });
-      saveLastSessionId(sessionId);
+      const created = finalizeProvision(result);
+      saveLastSessionId(created, { pendingNote: true });
       if (args.json) {
-        process.stdout.write(`${JSON.stringify({ sessionId })}
+        process.stdout.write(`${JSON.stringify({ sessionId: created })}
 `);
         return;
       }
-      consola.success(`Switched default session to ${sessionId}`);
-    } catch (err) {
-      if (isTransportFailure(err))
-        throw err;
-      reportCommandError(err, { json: args.json });
+      consola.success(`Created and switched to session ${created}`);
+      return;
     }
-  }
+    if (!sessionId) {
+      throw new Error("Pass the session id to switch to, or --new to create a new session.");
+    }
+    await ensureSessionExists({
+      apiBaseUrl,
+      apiKey: resolveApiKey(),
+      sessionId
+    });
+    saveLastSessionId(sessionId);
+    if (args.json) {
+      process.stdout.write(`${JSON.stringify({ sessionId })}
+`);
+      return;
+    }
+    consola.success(`Switched default session to ${sessionId}`);
+  }, { json: args.json })
 });
 var sessionsCommand = defineCommand({
   meta: {
@@ -20980,26 +21077,19 @@ function needsConfirmationRefusal(yes) {
 }
 
 // src/commands/skills.ts
-function resolveClient2() {
-  return new MediaStudioClient({
-    baseUrl: resolveApiBaseUrl(),
-    apiKey: resolveApiKey()
-  });
-}
 function stateMarker(state) {
-  if (state === "on")
-    return "[on]";
-  if (state === "off")
-    return "[off]";
-  return "[-] ";
+  const marker = state === "on" ? "[on]" : state === "off" ? "[off]" : "[-]";
+  return marker.padEnd(5);
 }
+var NAME_SEP = "  ";
+var NAME_INDENT = stateMarker("off").length + NAME_SEP.length;
 function renderSkillRow(state, name, description) {
   const marker = stateMarker(state);
   const colorize = state === "on" ? import_picocolors2.green : state === "off" ? import_picocolors2.red : import_picocolors2.dim;
-  const head = `${colorize(marker)}  ${stripControlChars(name)}`;
+  const head = `${colorize(marker)}${NAME_SEP}${stripControlChars(name)}`;
   const clean = stripControlChars(description).trim();
   return clean ? `${head}
-${" ".repeat(6)}${clean}` : head;
+${" ".repeat(NAME_INDENT)}${clean}` : head;
 }
 var addSkillCommand = defineCommand({
   meta: {
@@ -21018,23 +21108,17 @@ var addSkillCommand = defineCommand({
       description: "Output machine-readable JSON"
     }
   },
-  run: async ({ args }) => {
-    try {
-      const client = resolveClient2();
-      const entry = await findPlazaEntry(client, args["skill-slug"]);
-      const skill = await client.skills.install(entry);
-      if (args.json) {
-        process.stdout.write(`${JSON.stringify(skill, null, 2)}
+  run: ({ args }) => runCliCommand(async () => {
+    const client = createCliClient();
+    const entry = await findPlazaEntry(client, args["skill-slug"]);
+    const skill = await client.skills.install(entry);
+    if (args.json) {
+      process.stdout.write(`${JSON.stringify(skill, null, 2)}
 `);
-        return;
-      }
-      consola.success(`Installed ${stripControlChars(skill.command)} (${stripControlChars(skill.name)}).`);
-    } catch (err) {
-      if (isTransportFailure(err))
-        throw err;
-      reportCommandError(err, { json: args.json });
+      return;
     }
-  }
+    consola.success(`Installed ${stripControlChars(skill.command)} (${stripControlChars(skill.name)}).`);
+  }, { json: args.json })
 });
 var rmSkillCommand = defineCommand({
   meta: {
@@ -21058,36 +21142,30 @@ var rmSkillCommand = defineCommand({
       description: "Output machine-readable JSON"
     }
   },
-  run: async ({ args }) => {
-    try {
-      if (needsConfirmationRefusal(args.yes === true)) {
-        throw new Error("Confirmation required. Pass --yes to confirm removal non-interactively.");
-      }
-      if (!args.yes) {
-        const confirmed = await confirm({
-          message: `Remove skill "${args["skill-command"]}" from your library? Re-installing needs a fresh plaza install.`,
-          initialValue: false
-        });
-        if (isCancel(confirmed) || !confirmed) {
-          consola.info("Skill removal cancelled.");
-          return;
-        }
-      }
-      const client = resolveClient2();
-      const skill = await findLibraryEntry(client, args["skill-command"]);
-      await client.skills.remove(skill.id);
-      if (args.json) {
-        process.stdout.write(`${JSON.stringify({ success: true, id: skill.id, deleted: true }, null, 2)}
-`);
+  run: ({ args }) => runCliCommand(async () => {
+    if (needsConfirmationRefusal(args.yes === true)) {
+      throw new Error("Confirmation required. Pass --yes to confirm removal non-interactively.");
+    }
+    if (!args.yes) {
+      const confirmed = await confirm({
+        message: `Remove skill "${args["skill-command"]}" from your library? Re-installing needs a fresh plaza install.`,
+        initialValue: false
+      });
+      if (isCancel(confirmed) || !confirmed) {
+        consola.info("Skill removal cancelled.");
         return;
       }
-      consola.success(`Skill "${args["skill-command"]}" removed from your library.`);
-    } catch (err) {
-      if (isTransportFailure(err))
-        throw err;
-      reportCommandError(err, { json: args.json });
     }
-  }
+    const client = createCliClient();
+    const skill = await findLibraryEntry(client, args["skill-command"]);
+    await client.skills.remove(skill.id);
+    if (args.json) {
+      process.stdout.write(`${JSON.stringify({ success: true, id: skill.id, deleted: true }, null, 2)}
+`);
+      return;
+    }
+    consola.success(`Skill "${args["skill-command"]}" removed from your library.`);
+  }, { json: args.json })
 });
 function makeSetEnabledCommand(name, enabled, description) {
   return defineCommand({
@@ -21104,23 +21182,17 @@ function makeSetEnabledCommand(name, enabled, description) {
         description: "Output machine-readable JSON"
       }
     },
-    run: async ({ args }) => {
-      try {
-        const client = resolveClient2();
-        const found = await findLibraryEntry(client, args["skill-command"]);
-        const skill = await client.skills.setEnabled(found.id, enabled);
-        if (args.json) {
-          process.stdout.write(`${JSON.stringify(skill, null, 2)}
+    run: ({ args }) => runCliCommand(async () => {
+      const client = createCliClient();
+      const found = await findLibraryEntry(client, args["skill-command"]);
+      const skill = await client.skills.setEnabled(found.id, enabled);
+      if (args.json) {
+        process.stdout.write(`${JSON.stringify(skill, null, 2)}
 `);
-          return;
-        }
-        consola.success(`${enabled ? "Enabled" : "Disabled"} ${stripControlChars(skill.command)}.`);
-      } catch (err) {
-        if (isTransportFailure(err))
-          throw err;
-        reportCommandError(err, { json: args.json });
+        return;
       }
-    }
+      consola.success(`${enabled ? "Enabled" : "Disabled"} ${stripControlChars(skill.command)}.`);
+    }, { json: args.json })
   });
 }
 var enableSkillCommand = makeSetEnabledCommand("enable", true, "Enable a skill in your library");
@@ -21162,59 +21234,53 @@ var skillsCommand = defineCommand({
     enable: enableSkillCommand,
     rm: rmSkillCommand
   },
-  run: async ({ args }) => {
-    try {
-      const client = resolveClient2();
-      if (args.plaza) {
-        const plaza = await client.skills.browsePlaza();
-        if (args.json) {
-          process.stdout.write(`${JSON.stringify(plaza, null, 2)}
-`);
-          return;
-        }
-        if (plaza.length === 0) {
-          consola.info("The Skill Plaza has no entries yet.");
-          return;
-        }
-        const installed = plaza.filter((s) => s.added);
-        const available = plaza.filter((s) => !s.added);
-        const installedRows = installed.map((s) => renderSkillRow(s.enabled ? "on" : "off", s.name, s.descriptionEn));
-        const availableRows = available.map((s) => renderSkillRow("none", s.name, s.descriptionEn));
-        consola.log([
-          `Installed (${installed.length})`,
-          ...installedRows,
-          "",
-          `Available (${available.length})`,
-          ...availableRows,
-          "",
-          import_picocolors2.gray(`install with msc skills add <slug> · slug names are in --json`)
-        ].join(`
-`));
-        return;
-      }
-      const skills = await client.skills.listAll();
+  run: ({ args }) => runCliCommand(async () => {
+    const client = createCliClient();
+    if (args.plaza) {
+      const plaza = await client.skills.browsePlaza();
       if (args.json) {
-        process.stdout.write(`${JSON.stringify(skills, null, 2)}
+        process.stdout.write(`${JSON.stringify(plaza, null, 2)}
 `);
         return;
       }
-      if (skills.length === 0) {
-        consola.info("Your skill library is empty. Browse the plaza with --plaza, or add skills in the Media Studio web app.");
+      if (plaza.length === 0) {
+        consola.info("The Skill Plaza has no entries yet.");
         return;
       }
-      const rows = skills.map((s) => renderSkillRow(s.enabled ? "on" : "off", s.name, s.descriptionEn));
+      const installed = plaza.filter((s) => s.added);
+      const available = plaza.filter((s) => !s.added);
+      const installedRows = installed.map((s) => renderSkillRow(s.enabled ? "on" : "off", s.name, s.descriptionEn));
+      const availableRows = available.map((s) => renderSkillRow("none", s.name, s.descriptionEn));
       consola.log([
-        ...rows,
+        `Installed (${installed.length})`,
+        ...installedRows,
+        "",
+        `Available (${available.length})`,
+        ...availableRows,
         "",
-        import_picocolors2.gray("skills in this list can be referenced as %%skill-name%% in a prompt")
+        import_picocolors2.gray(`install with msc skills add <slug> · slug names are in --json`)
       ].join(`
 `));
-    } catch (err) {
-      if (isTransportFailure(err))
-        throw err;
-      reportCommandError(err, { json: args.json });
+      return;
     }
-  }
+    const skills = await client.skills.listAll();
+    if (args.json) {
+      process.stdout.write(`${JSON.stringify(skills, null, 2)}
+`);
+      return;
+    }
+    if (skills.length === 0) {
+      consola.info("Your skill library is empty. Browse the plaza with --plaza, or add skills in the Media Studio web app.");
+      return;
+    }
+    const rows = skills.map((s) => renderSkillRow(s.enabled ? "on" : "off", s.name, s.descriptionEn));
+    consola.log([
+      ...rows,
+      "",
+      import_picocolors2.gray("skills in this list can be referenced as %%skill-name%% in a prompt")
+    ].join(`
+`));
+  }, { json: args.json })
 });
 
 // src/commands/whoami.ts
@@ -21226,7 +21292,7 @@ var whoamiCommand = defineCommand({
     name: "whoami",
     description: "Display current authentication status"
   },
-  run: async () => {
+  run: () => runCliCommand(async () => {
     let auth;
     try {
       auth = readAuthFile();
@@ -21243,50 +21309,41 @@ var whoamiCommand = defineCommand({
       return;
     }
     const apiUrl = resolveApiBaseUrl();
-    const client = new MediaStudioClient({
-      baseUrl: apiUrl,
-      apiKey: auth.token
-    });
-    try {
-      const data = await client.getMe();
-      if (!data.valid) {
-        consola.error("Session expired or token invalid.\nPlease run `msc login` to re-authenticate.");
-        process.exit(1);
-        return;
-      }
-      const updatedName = data.name ?? auth.username;
-      const updatedUid = data.uid ?? auth.uid;
-      const updatedEmail = data.email ?? auth.email;
-      if (updatedName !== auth.username || updatedUid !== auth.uid || updatedEmail !== auth.email) {
-        try {
-          saveAuthFile({
-            ...auth,
-            token: client.apiKey,
-            username: updatedName,
-            uid: updatedUid,
-            email: updatedEmail
-          });
-        } catch (err) {
-          consola.warn(err instanceof Error ? err.message : String(err));
-        }
-      }
-      consola.success("Authenticated");
-      const lines = [
-        updatedName ? `  User:     ${updatedName}` : null,
-        updatedUid ? `  UID:      ${updatedUid}` : null,
-        updatedEmail ? `  Email:    ${updatedEmail}` : null,
-        data.apiKeyMasked ? `  API Key:  ${data.apiKeyMasked}` : null,
-        `  Token:    ${maskToken(client.apiKey)}`
-      ].filter(Boolean);
-      consola.log(`${lines.join(`
+    const client = createCliClient({ baseUrl: apiUrl, apiKey: auth.token });
+    const data = await client.getMe();
+    if (!data.valid) {
+      consola.error("Session expired or token invalid.\nPlease run `msc login` to re-authenticate.");
+      process.exit(1);
+      return;
+    }
+    const updatedName = data.name ?? auth.username;
+    const updatedUid = data.uid ?? auth.uid;
+    const updatedEmail = data.email ?? auth.email;
+    if (updatedName !== auth.username || updatedUid !== auth.uid || updatedEmail !== auth.email) {
+      try {
+        saveAuthFile({
+          ...auth,
+          token: client.apiKey,
+          username: updatedName,
+          uid: updatedUid,
+          email: updatedEmail
+        });
+      } catch (err) {
+        consola.warn(err instanceof Error ? err.message : String(err));
+      }
+    }
+    consola.success("Authenticated");
+    const lines = [
+      updatedName ? `  User:     ${updatedName}` : null,
+      updatedUid ? `  UID:      ${updatedUid}` : null,
+      updatedEmail ? `  Email:    ${updatedEmail}` : null,
+      data.apiKeyMasked ? `  API Key:  ${data.apiKeyMasked}` : null,
+      `  Token:    ${maskToken(client.apiKey)}`
+    ].filter(Boolean);
+    consola.log(`${lines.join(`
 `)}
 `);
-    } catch (err) {
-      if (isTransportFailure(err))
-        throw err;
-      reportCommandError(err);
-    }
-  }
+  })
 });
 
 // src/lib/update-check.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@302ai/media-studio-cli",
-  "version": "0.1.1",
+  "version": "0.1.2-beta.1",
   "description": "CLI for AI Media Studio — let external agents drive the core media-studio features",
   "author": "302.AI",
   "license": "Apache-2.0",