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

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.0",
   description: "CLI for AI Media Studio — let external agents drive the core media-studio features",
   author: "302.AI",
   license: "Apache-2.0",
@@ -16975,7 +16975,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 +17541,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;
@@ -18065,7 +18071,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 +18135,7 @@ class SessionNotFoundError extends Error {
   }
 }
 async function ensureSessionExists(options) {
-  const client = new MediaStudioClient({
+  const client = createCliClient({
     baseUrl: options.apiBaseUrl,
     apiKey: options.apiKey
   });
@@ -18149,7 +18155,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 +18233,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
   });
@@ -18352,7 +18358,7 @@ async function streamTurn(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({
@@ -18608,7 +18614,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(() => {});
@@ -20764,9 +20770,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,11 +20813,6 @@ ${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,
@@ -20830,27 +20846,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 +20879,22 @@ 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
-      });
-      if (args.json) {
-        process.stdout.write(`${JSON.stringify(response.data, null, 2)}
+  run: ({ args }) => runCliCommand(async () => {
+    const client = createCliClient();
+    const response = await client.sessions.artifacts({
+      sessionId: args.sessionId
+    });
+    if (args.json) {
+      process.stdout.write(`${JSON.stringify(response.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;
+    }
+    consola.log(renderArtifactsTable(response.data));
+  }, { json: args.json })
 });
 var useSessionCommand = defineCommand({
   meta: {
@@ -20913,50 +20917,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;
-      }
-      if (!sessionId) {
-        throw new Error("Pass the session id to switch to, or --new to create a new session.");
+  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.");
       }
-      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 +20978,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 +21009,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 +21043,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 +21083,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 +21135,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 +21193,7 @@ var whoamiCommand = defineCommand({
     name: "whoami",
     description: "Display current authentication status"
   },
-  run: async () => {
+  run: () => runCliCommand(async () => {
     let auth;
     try {
       auth = readAuthFile();
@@ -21243,50 +21210,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.0",
   "description": "CLI for AI Media Studio — let external agents drive the core media-studio features",
   "author": "302.AI",
   "license": "Apache-2.0",