ryugi-artifacts 1.46.4 → 1.47.0

package/dist/cli.cjs

@@ -19694,7 +19694,7 @@ var updateCommand = {
   },
   run: ({ values }, emit) => update2(
     {
-      current: "1.46.4",
+      current: "1.47.0",
       file: __filename,
       env: process.env,
       registry: process.env.npm_config_registry || "https://registry.npmjs.org/",
@@ -19775,7 +19775,7 @@ async function main(argv) {
   const [name, ...rest] = argv;
   const command = COMMANDS.find((candidate) => candidate.name === name);
   const json = argv.includes("--json") || !command?.explicitJson && !process.stdout.isTTY;
-  notifyUpdate("1.46.4", json, argv);
+  notifyUpdate("1.47.0", json, argv);
   const emit = (value) => {
     const line = json ? JSON.stringify(value) : text(value);
     if (!json && typeof value.error === "string") console.error(line);
@@ -19794,7 +19794,7 @@ async function main(argv) {
       return await command.run(parse(rest, command.options, command.positionals), emit);
     }
     if (name === "--version" || name === "-v") {
-      console.info("1.46.4");
+      console.info("1.47.0");
       return 0;
     }
     if (name === "--help" || name === "-h") {

package/dist/server.cjs

@@ -8798,7 +8798,7 @@ var import_node_os2 = __toESM(require("node:os"), 1);
 var import_node_path25 = __toESM(require("node:path"), 1);
 
 // package.json
-var version = "1.46.4";
+var version = "1.47.0";
 
 // src/server/app.ts
 var import_node_fs26 = __toESM(require("node:fs"), 1);
@@ -12043,8 +12043,12 @@ var en_default = {
     fromPageDetail: "Go back to Ryugi; the share panel refreshes on its own.",
     fromAgent: "Asked the agent to publish?",
     fromAgentDetail: "Have it run the publish command again.",
-    autoPublish: "Auto-publish is on",
-    autoPublishDetail: "After each agent turn, changed artifacts sync privately to Ryugi Cloud. To turn it off, run <code>ryugi-artifacts config --auto-publish off</code>.",
+    autoPublishOn: "Auto-publish is on",
+    autoPublishOff: "Auto-publish is off",
+    autoPublishDetail: "After each agent turn, changed artifacts sync privately to Ryugi Cloud, so you can open them on another device. Only you can see them.",
+    autoPublishTurnOn: "Turn on auto-publish",
+    autoPublishTurnOff: "Turn off auto-publish",
+    autoPublishWhere: "Change it any time in Settings, from your avatar at the top right of the artifact list.",
     notConnected: "Not connected",
     retry: "Sign in again",
     retryDetail: "Go back to Ryugi and click Sign in in the share panel again.",
@@ -12075,8 +12079,12 @@ var zh_default = {
     fromPageDetail: "\u56DE\u5230 Ryugi\uFF0C\u5206\u4EAB\u9762\u677F\u4F1A\u81EA\u52A8\u5237\u65B0\u3002",
     fromAgent: "\u8BA9 agent \u53D1\u5E03\u7684\uFF1F",
     fromAgentDetail: "\u8BA9\u5B83\u518D\u8FD0\u884C\u4E00\u6B21\u53D1\u5E03\u547D\u4EE4\u3002",
-    autoPublish: "\u81EA\u52A8\u53D1\u5E03\u5DF2\u6253\u5F00",
-    autoPublishDetail: "agent \u6BCF\u8F6E\u7ED3\u675F\u540E\uFF0C\u6539\u8FC7\u7684 artifact \u4F1A\u4EE5\u79C1\u5BC6\u65B9\u5F0F\u540C\u6B65\u5230 Ryugi Cloud\u3002\u5173\u95ED\uFF1A\u8FD0\u884C <code>ryugi-artifacts config --auto-publish off</code>\u3002",
+    autoPublishOn: "\u81EA\u52A8\u53D1\u5E03\u5DF2\u6253\u5F00",
+    autoPublishOff: "\u81EA\u52A8\u53D1\u5E03\u5DF2\u5173\u95ED",
+    autoPublishDetail: "agent \u6BCF\u8F6E\u7ED3\u675F\u540E\uFF0C\u6539\u8FC7\u7684 artifact \u4F1A\u4EE5\u79C1\u5BC6\u65B9\u5F0F\u540C\u6B65\u5230 Ryugi Cloud\uFF0C\u6362\u53F0\u8BBE\u5907\u4E5F\u80FD\u6253\u5F00\u3002\u53EA\u6709\u4F60\u80FD\u770B\u5230\u3002",
+    autoPublishTurnOn: "\u6253\u5F00\u81EA\u52A8\u53D1\u5E03",
+    autoPublishTurnOff: "\u5173\u95ED\u81EA\u52A8\u53D1\u5E03",
+    autoPublishWhere: "\u4EE5\u540E\u5728 Artifacts \u5217\u8868\u53F3\u4E0A\u89D2\u5934\u50CF \u203A \u8BBE\u7F6E \u91CC\u968F\u65F6\u4FEE\u6539\u3002",
     notConnected: "\u672A\u8FDE\u63A5",
     retry: "\u91CD\u65B0\u767B\u5F55",
     retryDetail: "\u56DE\u5230 Ryugi\uFF0C\u5728\u5206\u4EAB\u9762\u677F\u91CC\u518D\u70B9\u4E00\u6B21\u300C\u767B\u5F55\u300D\u3002",
@@ -12099,7 +12107,7 @@ var zh_default = {
 var serverText = (locale) => translator({ en: en_default, zh: zh_default }, locale);
 
 // src/server/callback-page.ts
-var CALLBACK_PAGE_CSP = "default-src 'none'; style-src 'unsafe-inline'; img-src data:; script-src 'none'; base-uri 'none'; form-action 'none'; frame-ancestors 'none'";
+var CALLBACK_PAGE_CSP = "default-src 'none'; style-src 'unsafe-inline'; img-src data:; script-src 'none'; base-uri 'none'; form-action 'self'; frame-ancestors 'none'";
 var escapeHtml = (value) => value.replaceAll(
   /[&<>"']/g,
   (ch2) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[ch2]
@@ -12170,10 +12178,25 @@ h1 em { margin-left: 8px; font-style: normal; color: var(--name); }
 .rows li { padding: 16px 0; border-bottom: 1px solid var(--rule); font-size: 14px; }
 .rows b { display: block; margin-bottom: 3px; font-weight: 600; }
 .rows span { color: var(--soft); font-size: 13px; }
+.auto { margin-top: 28px; padding: 16px 18px; border: 1px solid var(--rule); border-radius: 12px; }
+.auto form { display: flex; align-items: center; gap: 16px; margin: 0; }
+.auto .text { flex: 1; }
+.auto b { display: block; margin-bottom: 4px; font-size: 15px; font-weight: 600; }
+.auto .text span { color: var(--soft); font-size: 13px; line-height: 1.7; }
+.switch { flex-shrink: 0; width: 44px; height: 24px; padding: 2px; border: 0; border-radius: 12px; background: var(--rule); cursor: pointer; display: flex; }
+.switch[aria-checked="true"] { justify-content: flex-end; background: var(--ink); }
+.switch i { width: 20px; height: 20px; border-radius: 50%; background: var(--bg); }
+.switch:focus-visible { outline: 2px solid var(--name); outline-offset: 2px; }
+.auto .where { display: block; margin-top: 12px; padding-top: 12px; border-top: 1px solid var(--rule); color: var(--soft); font-size: 12px; }
 footer { display: flex; justify-content: space-between; gap: 16px; margin-top: 20px; font-size: 12px; color: var(--faint); }
 footer code { font: 12px var(--mono); }
 `;
 var row = (title, detail) => `<li><b>${title}</b><span>${detail}</span></li>`;
+var autoPublishCard = (t7, on5, ticket) => `<section class="auto"><form method="post" action="/api/cloud/callback/auto-publish">
+        <input type="hidden" name="ticket" value="${escapeHtml(ticket)}">
+        <span class="text"><b>${on5 ? t7("callback.autoPublishOn") : t7("callback.autoPublishOff")}</b><span>${t7("callback.autoPublishDetail")}</span></span>
+        <button class="switch" type="submit" name="value" value="${on5 ? "off" : "on"}" role="switch" aria-checked="${on5}" aria-label="${on5 ? t7("callback.autoPublishTurnOff") : t7("callback.autoPublishTurnOn")}"><i></i></button>
+      </form><span class="where">${t7("callback.autoPublishWhere")}</span></section>`;
 function callbackPage(result, locale = "en") {
   const t7 = serverText(locale);
   const host = escapeHtml(new URL(result.origin).host);
@@ -12181,7 +12204,8 @@ function callbackPage(result, locale = "en") {
   const body = result.ok ? `<p class="status">${CIRCLE_CHECK}${t7("callback.connected")}</p>
       <h1>${t7("callback.signedIn")}<em>${escapeHtml(result.login)}</em></h1>
       <p class="lead">${t7("callback.lead")}</p>
-      <ul class="rows">${row(t7("callback.fromPage"), t7("callback.fromPageDetail"))}${row(t7("callback.fromAgent"), t7("callback.fromAgentDetail"))}${result.autoPublish ? row(t7("callback.autoPublish"), t7("callback.autoPublishDetail")) : ""}</ul>` : `<p class="status">${CIRCLE_ALERT}${t7("callback.notConnected")}</p>
+      ${autoPublishCard(t7, result.autoPublish, result.ticket)}
+      <ul class="rows">${row(t7("callback.fromPage"), t7("callback.fromPageDetail"))}${row(t7("callback.fromAgent"), t7("callback.fromAgentDetail"))}</ul>` : `<p class="status">${CIRCLE_ALERT}${t7("callback.notConnected")}</p>
       <h1>${t7("callback.titleFailed")}</h1>
       <p class="lead">${escapeHtml(result.detail)}</p>
       <ul class="rows">${row(t7("callback.retry"), t7("callback.retryDetail"))}</ul>`;
@@ -24951,6 +24975,16 @@ function writeGlobalAutoPublish(file, value) {
   import_node_fs16.default.mkdirSync(import_node_path13.default.dirname(file), { recursive: true, mode: 448 });
   writeJsonAtomic(file, { ...readSettings(file), autoPublish: value });
 }
+function postponeGlobalAutoPublish(file) {
+  const settings = readSettings(file);
+  if (settings.autoPublishPostponed === true) {
+    writeGlobalAutoPublish(file, false);
+    return "off";
+  }
+  import_node_fs16.default.mkdirSync(import_node_path13.default.dirname(file), { recursive: true, mode: 448 });
+  writeJsonAtomic(file, { ...settings, autoPublishPostponed: true });
+  return "postponed";
+}
 function defaultGlobalAutoPublish(file) {
   if (readGlobalAutoPublish(file) === void 0) writeGlobalAutoPublish(file, true);
 }
@@ -24963,6 +24997,7 @@ function autoPublishEnabled({
 
 // src/server/cloud.ts
 var LOGIN_STATE_TTL_MS = 10 * 60 * 1e3;
+var CALLBACK_TICKET_TTL_MS = 30 * 60 * 1e3;
 var UPLOAD_CONCURRENCY = 6;
 var MAX_JSON_BODY = 4096;
 var CLOUD_ID = /^[\w-]{1,64}$/;
@@ -24994,7 +25029,7 @@ var CreateRefused = class extends CloudRefused {
   }
   detail;
 };
-async function readJsonBody(req) {
+async function readBodyText(req) {
   const chunks = [];
   let size = 0;
   for await (const chunk of req) {
@@ -25002,8 +25037,11 @@ async function readJsonBody(req) {
     if (size > MAX_JSON_BODY) throw new CloudRefused(413, "request body too large");
     chunks.push(chunk);
   }
+  return Buffer.concat(chunks).toString("utf8");
+}
+async function readJsonBody(req) {
   try {
-    return JSON.parse(Buffer.concat(chunks).toString("utf8") || "null");
+    return JSON.parse(await readBodyText(req) || "null");
   } catch {
     return null;
   }
@@ -25049,7 +25087,27 @@ function createCloudRoutes(options) {
     project: readConfig(configFile).config.autoPublish ?? null,
     enabled: !!readCredentials(credentialsFile2, origin) && autoPublishEnabled({ globalFile: settingsFile, projectFile: configFile })
   });
+  let postponed = false;
   const pendingStates = /* @__PURE__ */ new Map();
+  const callbackTickets = /* @__PURE__ */ new Map();
+  const issueTicket = (login) => {
+    const now = Date.now();
+    for (const [ticket2, issued] of callbackTickets)
+      if (issued.expires < now) callbackTickets.delete(ticket2);
+    const ticket = randomToken();
+    callbackTickets.set(ticket, { expires: now + CALLBACK_TICKET_TTL_MS, login });
+    return ticket;
+  };
+  const sendCallbackPage = (res, status, result, locale) => send(res, status, callbackPage({ ...result, origin }, locale), {
+    "Content-Type": "text/html; charset=utf-8",
+    "Content-Security-Policy": CALLBACK_PAGE_CSP
+  });
+  const signedInPage = (res, ticket, login, locale) => sendCallbackPage(
+    res,
+    200,
+    { ok: true, login, ticket, autoPublish: readGlobalAutoPublish(settingsFile) ?? false },
+    locale
+  );
   const loginUrl = () => {
     const now = Date.now();
     for (const [state2, pending] of pendingStates)
@@ -25381,7 +25439,7 @@ function createCloudRoutes(options) {
         origin,
         hostId: hostIdFor(credentialsFile2),
         artifacts: config.artifacts,
-        autoPublish: autoPublishState(),
+        autoPublish: { ...autoPublishState(), postponed },
         warning: warning ?? null
       });
       return;
@@ -25460,6 +25518,11 @@ function createCloudRoutes(options) {
       sendJson(res, 200, await setVisibility(ref, visibility));
       return;
     }
+    if (action === "auto-publish" && method === "POST" && first === "later" && !second) {
+      postponed = postponeGlobalAutoPublish(settingsFile) === "postponed";
+      sendJson(res, 200, { ...autoPublishState(), postponed });
+      return;
+    }
     if (action === "auto-publish" && method === "POST" && !first) {
       const body = await readJsonBody(req);
       const value = body?.value;
@@ -25480,10 +25543,7 @@ function createCloudRoutes(options) {
   return {
     async handleCallback(url, res, locale = "en") {
       const t7 = serverText(locale);
-      const page = (status, result) => send(res, status, callbackPage({ ...result, origin }, locale), {
-        "Content-Type": "text/html; charset=utf-8",
-        "Content-Security-Policy": CALLBACK_PAGE_CSP
-      });
+      const page = (status, result) => sendCallbackPage(res, status, result, locale);
       const state = url.searchParams.get("state") ?? "";
       const pending = pendingStates.get(state);
       pendingStates.delete(state);
@@ -25514,7 +25574,27 @@ function createCloudRoutes(options) {
       }
       writeCredentials(credentialsFile2, { origin, token: issued.token, login: issued.login });
       defaultGlobalAutoPublish(settingsFile);
-      page(200, { ok: true, login: issued.login, autoPublish: autoPublishState().enabled });
+      signedInPage(res, issueTicket(issued.login), issued.login, locale);
+    },
+    async handleCallbackAutoPublish(req, res, locale = "en") {
+      if (req.method !== "POST") {
+        send(res, 405, "Method not allowed");
+        return;
+      }
+      const form = new URLSearchParams(await readBodyText(req));
+      const ticket = form.get("ticket") ?? "";
+      const issued = callbackTickets.get(ticket);
+      const value = form.get("value");
+      if (!issued || issued.expires < Date.now()) {
+        send(res, 403, "Forbidden");
+        return;
+      }
+      if (value !== "on" && value !== "off") {
+        send(res, 400, "value must be on or off");
+        return;
+      }
+      writeGlobalAutoPublish(settingsFile, value === "on");
+      signedInPage(res, ticket, issued.login, locale);
     },
     match: (pathname) => ROUTE.exec(pathname),
     autoPublish,
@@ -100800,6 +100880,16 @@ async function startArtifactsServer(options) {
       });
       return;
     }
+    if (cloud && pathname === "/api/cloud/callback/auto-publish") {
+      void cloud.handleCallbackAutoPublish(
+        req,
+        res,
+        resolveLocale(parseAcceptLanguage(req.headers["accept-language"]))
+      ).catch((err) => {
+        if (!res.headersSent) send(res, 500, `Artifacts error: ${err.message}`);
+      });
+      return;
+    }
     const key2 = url2.searchParams.get("key");
     if (!isAuthorized(req, key2)) {
       send(res, 403, "Forbidden: open the full artifact link including ?key=");