@buildinternet/uploads 0.26.0 → 0.27.0

package/LICENSE

@@ -1,21 +1,202 @@
-MIT License
-
-Copyright (c) 2026 Build Internet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2026 Build Internet
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -98,6 +98,11 @@ explicit deletes. Promotion (auto or `--promote`) does skip files staged
 more than 30 days before the PR opens, though; they're still there, just no
 longer auto-promoted.
 
+**Metadata edits re-sync the comment too:** `uploads meta set` on a `gh/…`-keyed
+object refreshes the managed comment automatically when it touches `path` or
+`state` — best-effort, so backfilled metadata shows up without waiting on the
+next `attach`.
+
 **Bare `put` stages too, by default (issue #403):** on a non-default git
 branch, a `put` with none of
 `--pr`/`--issue`/`--key`/`--ref`/`--prefix`/`--destination` set

package/dist/cli-catalog.js

@@ -60,6 +60,7 @@ export const SCREENSHOT_FLAGS = [
     "--light",
     "--wait",
     "--out",
+    "--no-sidecar",
     "--no-upload",
     "--destination",
     "--prefix",

package/dist/cli.js

@@ -19,6 +19,7 @@ import { runReport } from "./commands/report.js";
 import { runScreenshot } from "./commands/screenshot.js";
 import { packageVersion } from "./package-version.js";
 import { checkForUpdate, maybeHintUpdate } from "./update-check.js";
+import { maybeSyncSessionCliVersion } from "./session-cli-version.js";
 import { errorCodeFromUnknown, maybeShowFirstRunNotice, recordEvent, telemetryCommandName, } from "./telemetry.js";
 async function writeRootHelp(options = {}) {
     // Best-effort version check so the help header can show a banner when outdated.
@@ -197,6 +198,10 @@ export async function runCli(argv) {
         const json = parsed.globals.json ?? false;
         const quiet = parsed.globals.quiet ?? false;
         apiUrl = resolveApiUrl(parsed.globals);
+        // Refresh session.cliVersion when the installed package changes (no-op without a session token).
+        if (parsed.command && parsed.command !== "login" && parsed.command !== "logout") {
+            maybeSyncSessionCliVersion({ apiUrl, envFile: parsed.globals.envFile });
+        }
         if (parsed.globals.version) {
             process.stdout.write(`${packageVersion()}\n`);
             return 0;

package/dist/client.d.ts

@@ -291,6 +291,11 @@ export interface UsageResult {
     uploadsRemaining?: number;
     /** File scopes of the presented token (servers ≥ this field's release). */
     scopes?: Array<TokenScope>;
+    /**
+     * Workspace plan catalog id (`free` | `pro`). Present on API workers that
+     * ship plan-aware usage; omitted on older servers.
+     */
+    plan?: string;
 }
 export interface ReconcileResult {
     workspace: string;

package/dist/commands/config.js

@@ -19,6 +19,7 @@ Keys:
   UPLOADS_API_URL           API base URL (default: ${DEFAULT_API_URL})
   UPLOADS_WORKSPACE         Workspace / bucket tenant (default: ${DEFAULT_WORKSPACE})
   UPLOADS_TOKEN             Bearer token for the workspace
+  UPLOADS_SESSION_TOKEN     Device-flow session (CLI version on account sessions)
   UPLOADS_DEFAULT_PREFIX    Default key prefix for put/list
   UPLOADS_DEFAULT_REPO      Default repo segment for put
   UPLOADS_DEFAULT_REF       Default ref segment for put
@@ -195,7 +196,11 @@ Examples:
     const path = flagString(parsed.flags, "--path") ?? resolveConfigPath({ envFile: opts.envFile });
     const force = flagBool(parsed.flags, "--force");
     const result = writeConfigKeys(path, { [key]: value }, { force });
-    const payload = { ...result, key, value: key === "UPLOADS_TOKEN" ? redactToken(value) : value };
+    const payload = {
+        ...result,
+        key,
+        value: key === "UPLOADS_TOKEN" || key === "UPLOADS_SESSION_TOKEN" ? redactToken(value) : value,
+    };
     if (opts.json)
         writeJson(payload);
     else

package/dist/commands/login.js

@@ -2,12 +2,13 @@ import { hostname } from "node:os";
 import { createInterface } from "node:readline/promises";
 import { spawn } from "node:child_process";
 import { stdin, stdout } from "node:process";
-import { loadConfigFile, redactToken, resolveConfigPath, writeConfigKeys, workspaceFromToken, } from "../config.js";
+import { authUrlFromApi, loadConfigFile, redactToken, removeConfigKeys, resolveConfigPath, writeConfigKeys, workspaceFromToken, } from "../config.js";
 import { createUploadsClient, createWorkspaceRequest, exchangeEnrollment, listMintWorkspaces, mintWorkspaceToken, requestDeviceCode, requestDeviceToken, } from "../client.js";
 import { flagBool, flagString, parseCommandArgs, UsageError } from "../cli-args.js";
 import { parseScopes } from "./admin-enrollment.js";
 import { writeCommandHelp } from "../cli-style.js";
 import { UploadsError } from "../errors.js";
+import { syncSessionCliVersion } from "../session-cli-version.js";
 const HELP = `uploads login [options]
 
 Sign in and save workspace credentials. With no flags, opens a browser to
@@ -168,17 +169,7 @@ export function resolveAuthUrl(parsed, apiUrl) {
     const explicit = flagString(parsed.flags, "--auth-url") ?? process.env.UPLOADS_AUTH_URL;
     if (explicit)
         return explicit.replace(/\/$/, "");
-    try {
-        const url = new URL(apiUrl);
-        if (url.hostname.startsWith("api.")) {
-            url.hostname = `auth.${url.hostname.slice(4)}`;
-            return url.origin;
-        }
-    }
-    catch {
-        // fall through to the default
-    }
-    return "https://auth.uploads.sh";
+    return authUrlFromApi(apiUrl);
 }
 /** Best-effort browser open. The URL is always printed too, so failures are silent. */
 function openUrl(url) {
@@ -288,7 +279,13 @@ async function runDeviceLogin(parsed, opts, io) {
         scopes,
         label,
     }).catch((err) => describeMintFailure(opts.apiUrl, session.accessToken, workspace, err));
-    return { workspace: minted.workspace, token: minted.token, apiUrl: opts.apiUrl };
+    return {
+        workspace: minted.workspace,
+        token: minted.token,
+        apiUrl: opts.apiUrl,
+        sessionToken: session.accessToken,
+        authUrl: opts.authUrl,
+    };
 }
 function safeHostname() {
     try {
@@ -408,9 +405,24 @@ export async function runLogin(args, opts, help = false, deviceIo = defaultDevic
         UPLOADS_API_URL: savedApiUrl,
         UPLOADS_WORKSPACE: result.workspace,
         UPLOADS_TOKEN: result.token,
+        // Device login only — enables throttled session.cliVersion refresh.
+        ...(result.sessionToken ? { UPLOADS_SESSION_TOKEN: result.sessionToken } : {}),
     }, { force });
     if (!["UPLOADS_API_URL", "UPLOADS_WORKSPACE", "UPLOADS_TOKEN"].every((key) => write.updated.includes(key)))
         throw new UsageError("credentials were not fully written; retry with --force");
+    // Enrollment path: drop any stale device session so we don't heartbeat a dead token.
+    if (!result.sessionToken) {
+        removeConfigKeys(path, ["UPLOADS_SESSION_TOKEN"]);
+    }
+    else {
+        // Seed session.cliVersion immediately (don't wait for the next command).
+        await syncSessionCliVersion({
+            sessionToken: result.sessionToken,
+            authUrl: result.authUrl,
+            apiUrl: savedApiUrl,
+            force: true,
+        });
+    }
     const checked = !flagBool(parsed.flags, "--no-check");
     let doctor = { ok: true, error: undefined };
     if (checked) {

package/dist/commands/screenshot.js

@@ -2,15 +2,16 @@ import { readFileSync, writeFileSync } from "node:fs";
 import { basename } from "node:path";
 import { flagBool, flagInt, flagString, flagValues, parseCommandArgs, UsageError, } from "../cli-args.js";
 import { writeCommandHelp } from "../cli-style.js";
-import { branchFromFlags, derivedMetaEnabled, frameOptionsFromFlags, ghTargetFromFlags, optimizeOptionsFromFlags, stateAppMetaFromFlags, warnNearMissMeta, syncAttachmentsComment, commentViaSuffix, uploadPreparedImage, } from "../commands.js";
+import { branchFromFlags, derivedMetaEnabled, frameOptionsFromFlags, ghTargetFromFlags, optimizeOptionsFromFlags, stateAppMetaFromFlags, warnNearMissMeta, syncAttachmentsComment, commentViaSuffix, uploadPreparedImage, resolvePutStagingTarget, putStagingNoteText, resolveStageBindingWarning, mergeStagingMeta, } from "../commands.js";
 import { resolvePutDefaults } from "../config.js";
 import { loadDefaultsRaw, resolveScreenshotDefaults } from "../config-file.js";
 import { resolvePutPrefix } from "../destinations.js";
 import { execRunner, ghMetadataFromTargetWithTitle, resolveRepo, } from "../github-gh.js";
-import { ghBranchAttachmentKey, ghMetadataForBranch } from "../github.js";
+import { ghBranchAttachmentKey } from "../github.js";
 import { safeCaptureFacts } from "../capture-facts.js";
 import { parseMetaFlags, validateMetaMap } from "../metadata.js";
 import { mergeDerivedMeta } from "../metadata-vocab.js";
+import { writeSidecarMeta } from "../sidecar.js";
 import { writeJson, writeStdout } from "../io.js";
 import { assertHideSelector, captureScreenshot, parseViewport, parseWaitUntil, } from "../screenshot.js";
 const SCREENSHOT_HELP = `uploads screenshot <target> [options]
@@ -33,6 +34,15 @@ fail fast with a clear error instead of sending a doomed request.
 After capture, screenshots share the put upload pipeline: optional --frame,
 optimize-by-default, --pr/--issue attachment + --comment, --gallery, --meta.
 
+Branch staging by default (pre-PR): with no --pr/--issue/--branch/--key/--ref/
+--prefix/--destination, a screenshot taken on a non-default git branch stages
+under gh/<owner>/<repo>/branch/<branch>/<name> instead of the dated
+screenshots/<repo>/<date>/... layout — same key/metadata as an explicit
+--branch, carrying every derived fact (path/url/env/viewport, --state) along.
+Staged files auto-attach with full metadata the first time you attach to that
+branch's PR once it opens (or run "uploads attach --promote"). Use --no-git,
+or an explicit --ref/--prefix, to opt back into the dated layout.
+
 Options:
   --via auto|local|remote   Capture backend (default: auto, or UPLOADS_SCREENSHOT_VIA)
   --browser <path>          Explicit local browser executable (or UPLOADS_CHROME_PATH / CHROME_PATH)
@@ -51,7 +61,12 @@ Options:
                             on --via remote — neutralizes animations via injected CSS)
   --eval <js>               Run JS in the page after settle, before capture (--via local only)
   --init-script <file>      Inject a JS file before navigation (--via local only)
-  --out <file>              Also write the PNG to a local file
+  --out <file>              Also write the PNG to a local file. Also writes a sidecar manifest,
+                            <file>.uploads.json, recording this capture's derived metadata
+                            (path/url/env/viewport, plus --state if given) with a content hash; a
+                            later \`put\`/\`attach\` of this exact file picks the metadata back up
+                            automatically (explicit --meta/--state still win). See --no-sidecar.
+  --no-sidecar              Don't write the <file>.uploads.json sidecar alongside --out
   --no-upload                Skip hosting; requires --out (local file only)
   --destination <id>        Typed root: screenshots | gh | f
   --prefix <path>           Key prefix (default: screenshots, or UPLOADS_DEFAULT_PREFIX)
@@ -171,6 +186,9 @@ captureImpl = captureScreenshot) {
     const noUpload = flagBool(parsed.flags, "--no-upload");
     if (noUpload && !outFile)
         throw new UsageError("--no-upload requires --out");
+    const noSidecar = flagBool(parsed.flags, "--no-sidecar");
+    if (noSidecar && !outFile)
+        throw new UsageError("--no-sidecar requires --out");
     const keyHint = flagString(parsed.flags, "--key");
     const destFlag = flagString(parsed.flags, "--destination");
     const prefixFlag = flagString(parsed.flags, "--prefix");
@@ -210,14 +228,38 @@ captureImpl = captureScreenshot) {
         if (noUpload)
             throw new UsageError("--dry-run cannot be combined with --no-upload");
     }
+    const putDefaults = resolvePutDefaults({ envFile: ctx.envFile }, rawDefaults);
+    const noGit = flagBool(parsed.flags, "--no-git") || putDefaults.noGit === true;
     const branchRepo = branchArg !== undefined ? resolveRepo(flagString(parsed.flags, "--repo"), run) : undefined;
+    // Auto branch staging (issue #469 lever 1): mirrors bare `put`'s auto-staging
+    // (issue #403). When no --branch/--pr/--issue/--key/--ref/--prefix/--destination
+    // is given and git use isn't disabled, a screenshot taken on a non-default
+    // git branch stages the same way explicit `--branch`/bare `put` do — same
+    // key shape, same gh.* metadata — instead of landing on the dated
+    // `screenshots/<repo>/<date>/...` layout. This is what lets derived
+    // metadata (path/url/env/viewport, --state) ride through to PR-open
+    // promotion when the capture happens before the PR exists. Skipped
+    // entirely when --branch was given explicitly (already handled above).
+    const autoStagingTarget = branchArg === undefined
+        ? resolvePutStagingTarget({
+            ghTarget,
+            keyHint,
+            refArg: flagString(parsed.flags, "--ref"),
+            prefixArg: prefixFlag,
+            destinationArg: destFlag,
+            noGit,
+            repoArg: flagString(parsed.flags, "--repo") ?? putDefaults.repo,
+            run,
+        })
+        : undefined;
+    const stagingTarget = branchArg !== undefined ? { repo: branchRepo, branch: branchArg } : autoStagingTarget;
     let resolvedPrefix;
     try {
         resolvedPrefix = resolvePutPrefix({
             destination: destFlag,
             prefix: prefixFlag,
             key: keyHint,
-            ghAttachment: Boolean(ghTarget) || branchArg !== undefined,
+            ghAttachment: Boolean(ghTarget) || stagingTarget !== undefined,
         });
     }
     catch (err) {
@@ -233,7 +275,6 @@ captureImpl = captureScreenshot) {
                 return raw;
             throw new UsageError(`invalid --format: ${raw}`);
         })();
-    const putDefaults = resolvePutDefaults({ envFile: ctx.envFile }, rawDefaults);
     const optimizeOpts = optimizeOptionsFromFlags(parsed.flags, putDefaults);
     const frameOpts = frameOptionsFromFlags(parsed.flags);
     const altFlag = flagString(parsed.flags, "--alt");
@@ -248,9 +289,8 @@ captureImpl = captureScreenshot) {
         metadata = { ...withFacts, ...ghMetadataFromTargetWithTitle(ghTarget, run) };
         validateMetaMap(metadata);
     }
-    else if (branchArg !== undefined) {
-        metadata = { ...withFacts, ...ghMetadataForBranch(branchRepo, branchArg) };
-        validateMetaMap(metadata);
+    else if (stagingTarget !== undefined) {
+        metadata = mergeStagingMeta(withFacts, stagingTarget);
     }
     else if (Object.keys(withFacts).length > 0) {
         validateMetaMap(withFacts);
@@ -282,6 +322,8 @@ captureImpl = captureScreenshot) {
         writeFileSync(outFile, captured.png);
         if (logHuman)
             process.stderr.write(`>> wrote ${outFile}\n`);
+        if (!noSidecar)
+            writeSidecarMeta(outFile, captured.png, withFacts);
     }
     if (noUpload) {
         if (ctx.json) {
@@ -294,8 +336,8 @@ captureImpl = captureScreenshot) {
     }
     const repo = flagString(parsed.flags, "--repo") ?? putDefaults.repo;
     const ref = flagString(parsed.flags, "--ref") ?? putDefaults.ref;
-    const branchKey = branchArg !== undefined
-        ? ghBranchAttachmentKey(branchRepo, branchArg, captured.filename)
+    const branchKey = stagingTarget !== undefined
+        ? ghBranchAttachmentKey(stagingTarget.repo, stagingTarget.branch, captured.filename)
         : undefined;
     const alt = altFlag ?? basename(captured.filename);
     const { result, prepared, markdown } = await uploadPreparedImage(ctx.client, captured.png, captured.filename, {
@@ -306,13 +348,26 @@ captureImpl = captureScreenshot) {
         prefix: resolvedPrefix ?? putDefaults.prefix,
         repo,
         ref,
-        deriveRepoFromGit: !(flagBool(parsed.flags, "--no-git") || putDefaults.noGit === true),
+        deriveRepoFromGit: !noGit,
         dryRun,
         metadata,
         provenanceClient: "uploads-cli-screenshot",
         alt: () => alt,
         width,
     });
+    // Staging note (issue #469 lever 1, mirrors #403's bare-put note): only for
+    // the auto-staged case — explicit `--branch` keeps its own "staged: these
+    // auto-attach..." wording below. Same suppression as put's note (--quiet,
+    // UPLOADS_NO_NUDGE=1).
+    const stagingNote = autoStagingTarget && !ctx.quiet && !putDefaults.noNudge
+        ? putStagingNoteText(autoStagingTarget.branch)
+        : undefined;
+    // Stage-time binding warning (issue #398), same check bare put/attach
+    // --branch run, now also reachable from screenshot's staging paths
+    // (explicit --branch and auto-staging alike).
+    const bindingWarning = stagingTarget !== undefined
+        ? await resolveStageBindingWarning({ ctx, defaults: putDefaults, repo: stagingTarget.repo })
+        : undefined;
     let gallery;
     if (galleryId) {
         try {
@@ -347,8 +402,25 @@ captureImpl = captureScreenshot) {
         if (prepared.optimized) {
             process.stderr.write(`>> optimized ${prepared.originalBytes} → ${prepared.outputBytes} bytes\n`);
         }
-        process.stderr.write(`>> key: ${result.key}${dryRun ? " (dry run — not uploaded)" : ""}\n\n`);
+        process.stderr.write(`>> key: ${result.key}${dryRun ? " (dry run — not uploaded)" : ""}\n`);
+        if (stagingTarget !== undefined) {
+            process.stderr.write(`>> find these later: uploads find gh.branch=${stagingTarget.branch.toLowerCase()}\n`);
+            if (autoStagingTarget) {
+                if (stagingNote)
+                    process.stderr.write(`${stagingNote}\n`);
+            }
+            else {
+                process.stderr.write(`>> staged: these auto-attach to this branch's PR when it opens ` +
+                    `(or run \`uploads attach --promote\` after opening)\n`);
+            }
+        }
+        if (bindingWarning)
+            process.stderr.write(`${bindingWarning}\n`);
+        process.stderr.write("\n");
     }
+    // One JSON `hint` slot (mirrors bare put): the binding warning is more
+    // actionable than the generic staging note, so it wins when both fire.
+    const jsonHint = bindingWarning ?? stagingNote;
     switch (format) {
         case "json":
             await writeJson({
@@ -363,6 +435,7 @@ captureImpl = captureScreenshot) {
                 backend: captured.backend,
                 gallery,
                 ...(dryRun ? { dryRun: true } : {}),
+                ...(jsonHint ? { hint: jsonHint } : {}),
             });
             break;
         case "url":

package/dist/commands/session.js

@@ -23,8 +23,9 @@ Examples:
 `;
 const LOGOUT_HELP = `uploads logout
 
-Remove the saved UPLOADS_TOKEN from the shared config file so this machine is
-no longer signed in for the CLI. Does not revoke the token on the server.
+Remove the saved UPLOADS_TOKEN (and device session token) from the shared
+config file so this machine is no longer signed in for the CLI. Does not
+revoke tokens on the server.
 
 Environment variables (UPLOADS_TOKEN) are not unset — export them yourself if set.
 
@@ -112,7 +113,7 @@ export async function runLogout(args, opts, help = false) {
     const path = flagString(parsed.flags, "--path") ?? resolveConfigPath({ envFile: opts.envFile });
     const hadFileToken = Boolean(loadConfigFile(path).UPLOADS_TOKEN);
     const envTokenStillSet = Boolean(process.env.UPLOADS_TOKEN);
-    const result = removeConfigKeys(path, ["UPLOADS_TOKEN"]);
+    const result = removeConfigKeys(path, ["UPLOADS_TOKEN", "UPLOADS_SESSION_TOKEN"]);
     const payload = {
         path: result.path,
         removed: result.removed,
@@ -124,8 +125,9 @@ export async function runLogout(args, opts, help = false) {
         await writeJson(payload);
         return 0;
     }
-    if (result.removed.includes("UPLOADS_TOKEN")) {
-        process.stdout.write(`signed out — removed UPLOADS_TOKEN from ${result.path}\n`);
+    if (result.removed.includes("UPLOADS_TOKEN") ||
+        result.removed.includes("UPLOADS_SESSION_TOKEN")) {
+        process.stdout.write(`signed out — removed credentials from ${result.path}\n`);
     }
     else if (!result.existed) {
         process.stdout.write(`no config file at ${result.path} — already signed out\n`);

package/dist/commands.d.ts

@@ -167,6 +167,21 @@ export declare function commentViaSuffix(via: AttachmentsCommentResult["via"]):
 export declare class GithubCommentAuthorizationError extends Error {
 }
 export declare function syncAttachmentsComment(client: UploadsClient, target: GhTarget, run: CommandRunner, workspace?: string): Promise<AttachmentsCommentResult>;
+/**
+ * Lever 3 (issue #469): a nudge for when an image lands on a PR/issue with
+ * no `path` metadata — `path` is one of the highest-value queryable tags
+ * (same tier as `state=`), and unlike `uploads screenshot` (which derives it
+ * from the captured URL), a plain `attach`/`put --pr`/`put --issue` of an
+ * already-existing image has nothing to derive it from, so it's easy to
+ * forget. Fires once per batch (not per file) — checks the metadata the
+ * server actually stored (`PutResult.metadata`), not what was requested, so
+ * a merge/validation drop still surfaces the gap. Non-image uploads (zips,
+ * PDFs, etc.) are exempt — "findable by page" doesn't apply to them.
+ */
+export declare function pathMetaHintFor(uploads: {
+    contentType: string;
+    metadata?: Record<string, string>;
+}[]): string | undefined;
 export type AttachUploadItem = PutResult & {
     file: string;
     markdown: string;
@@ -355,6 +370,14 @@ export declare function resolvePutStagingTarget(opts: {
     repoArg: string | undefined;
     run: CommandRunner;
 }): BranchTarget | undefined;
+/**
+ * Merges a staging target's `gh.*` branch metadata over `base` and validates
+ * the result (same builder, same contract as `attach --branch`) — the one
+ * merge+validate step shared by every staging call site: `runPut`,
+ * `runScreenshot`, and both the local stdio MCP `put` and `screenshot`
+ * tools.
+ */
+export declare function mergeStagingMeta(base: Record<string, string> | undefined, target: BranchTarget): Record<string, string>;
 /**
  * The bare-put staging note's wording (issue #403): replaces the #393 nudge
  * for the (now default) case where a bare put on a non-default branch stages