@vincentt-xr/cli 0.4.0 → 0.5.0

package/dist/cli/index.js

@@ -35,7 +35,7 @@ import { mintRateLimited, notSignedIn, previewConflict, startBlock, } from "../p
 import { renderTerminalQr, shouldRenderQr } from "../preview/qr.js";
 import { PreviewConflictError, PreviewRateLimitedError } from "../preview/api.js";
 import { fetchNext, readCursor, writeCursor } from "../lib/feedback.js";
-import { isHelpInvocation, isVersionInvocation, positionalArgs, refusedFlag } from "./args.js";
+import { isHelpInvocation, isVersionInvocation, positionalArgs, refusedFlag, } from "./args.js";
 // The console origin serves /cli-auth (the browser target for `vincentt login`). VINCENTT_
 // CONSOLE_URL overrides for dev/dogfood; VINCENTT_EDITOR_URL is honored as a legacy alias.
 const DEFAULT_CONSOLE_URL = "https://vincentt.app";
@@ -62,18 +62,20 @@ function positional(n) {
     return positionalArgs(argv)[n];
 }
 // ---- auth -------------------------------------------------------------------
-function resolveAuthUrls() {
+async function resolveAuthUrls() {
+    const machine = await loadMachineConfig();
     const consoleUrl = flag("--console") ??
         flag("--editor") ??
         process.env.VINCENTT_CONSOLE_URL ??
         process.env.VINCENTT_EDITOR_URL ??
+        machine.consoleUrl ??
         DEFAULT_CONSOLE_URL;
-    const apiUrl = flag("--api") ?? process.env.VINCENTT_API_URL ?? DEFAULT_API_URL;
+    const apiUrl = flag("--api") ?? process.env.VINCENTT_API_URL ?? machine.apiUrl ?? DEFAULT_API_URL;
     return { consoleUrl, apiUrl };
 }
 /** The PKCE loopback + code-exchange login (f1). The raw PAT never rides a redirect query. */
 async function runLoginFlow() {
-    const { consoleUrl, apiUrl } = resolveAuthUrls();
+    const { consoleUrl, apiUrl } = await resolveAuthUrls();
     return runPkceLogin({
         consoleUrl,
         apiUrl,
@@ -82,7 +84,7 @@ async function runLoginFlow() {
 }
 /** `vincentt login` [--force] — the L1/L2/L4 transcripts. */
 async function login() {
-    const { apiUrl } = resolveAuthUrls();
+    const { apiUrl } = await resolveAuthUrls();
     const code = await loginCommand({
         print: (line) => console.log(line),
         currentToken,
@@ -317,6 +319,14 @@ async function preview() {
             onViewer: (label, uaClass) => ui.viewerSeen(label, uaClass),
             onViewerGone: (label) => ui.viewerGone(label),
             onEvents: (events, tags) => ui.events(events, tags),
+            onAttribute: (tags) => {
+                // The hello resolved a tester on connect. Same guard the events path
+                // uses: a connection with no viewer label has nothing to attribute in
+                // the roster (the roster is keyed by label).
+                if (tags.viewer !== undefined && tags.tester !== undefined) {
+                    ui.testerSeen(tags.viewer, tags.tester);
+                }
+            },
             onCapReached: () => ui.capReached(),
             onTunnelState: (state) => ui.tunnel(state),
             onOriginError: () => ui.originError(),
@@ -375,7 +385,7 @@ async function preview() {
     await done;
     clearInterval(ceiling);
     if (ending !== null) {
-        ui.endedBy(ending, (await activeOrgName()) || "your organization");
+        ui.endedBy(ending, (await activeOrgName()) || "your workspace");
         await previewStop();
         process.exitCode = 1;
     }
@@ -407,7 +417,11 @@ async function followPreview(info, ui, filterTester, filterViewer) {
     });
     while (!stop) {
         try {
-            const result = await relay.query({ since, tester: filterTester, viewer: filterViewer });
+            const result = await relay.query({
+                since,
+                tester: filterTester,
+                viewer: filterViewer,
+            });
             // An unknown id is a FACT, not an error — and the remedy goes on the same
             // line. Said once rather than on every poll, or a two-second loop becomes
             // a wall of identical advisories.
@@ -563,6 +577,7 @@ function usage() {
         `  Full guide: npm view @vincentt-xr/cli readme\n\n` +
         `Auth\n` +
         `  login              Sign in; save an access token to ~/.vincentt/config.json\n` +
+        `                       [--api <url>] [--console <url>] to target a non-prod env\n` +
         `  logout             Remove the saved access token\n` +
         `  whoami             Show the signed-in account\n\n` +
         `Project\n` +

package/dist/lib/lifecycle.js

@@ -64,8 +64,8 @@ export async function resolveOrgForCommand(cfg, input) {
     return {
         ok: false,
         message: asked
-            ? `✗ You are not an active member of "${asked.slug}".\n\n  Run \`vincentt whoami\` to see which organizations you belong to.`
-            : "✗ No active organization.\n\n  Run `vincentt whoami` to see which organizations you belong to,\n  then re-run with `--org <slug>`.",
+            ? `✗ You are not an active member of "${asked.slug}".\n\n  Run \`vincentt whoami\` to see which workspaces you belong to.`
+            : "✗ No active workspace.\n\n  Run `vincentt whoami` to see which workspaces you belong to,\n  then re-run with `--org <slug>`.",
     };
 }
 /**

package/dist/lib/projects.js

@@ -161,7 +161,7 @@ export function printUnreachable(print, message) {
     print(`✗ ${asSentence(message)}`);
     print("");
     print("  This folder is linked to a project that can't be reached with your current");
-    print("  account. It may have been deleted, or it may belong to an organization you're");
+    print("  account. It may have been deleted, or it may belong to a workspace you're");
     print("  not a member of.");
     print("");
     print("  Check who you are:   vincentt whoami");

package/dist/lib/whoami.js

@@ -31,8 +31,8 @@ export async function whoamiCommand(deps) {
     // Printed even when there is no active org: an absent line is indistinguishable
     // from a bug on exactly the path where the creator is already confused.
     deps.print(org
-        ? `  Active org:  ${org.name} (${org.slug})`
-        : "  Active org:  none — pass --org <slug>");
+        ? `  Active workspace:  ${org.name} (${org.slug})`
+        : "  Active workspace:  none — pass --org <slug>");
     deps.print(`  API:         ${cfg.apiUrl}`);
     return 0;
 }

package/dist/login/loginCommand.js

@@ -27,7 +27,7 @@ export function orgSummaryLine(identity) {
         .filter((m) => m !== active)
         .map((m) => m.orgName)
         .filter(Boolean);
-    const base = `  Active org: ${activeName}`;
+    const base = `  Active workspace: ${activeName}`;
     return others.length ? `${base}   ·   also a member of: ${others.join(", ")}` : base;
 }
 /**

package/dist/preview/runner.d.ts

@@ -70,6 +70,14 @@ export interface StartPreviewOptions {
      * itself, so the first events of a load are routinely un-attributed.
      */
     onEvents?: (events: DiagEvent[], tags: EventTags) => void;
+    /**
+     * A connection introduced its tester on the `hello`, at connect, before any
+     * event. This is what makes `tester-N connected` print for a SILENT app and
+     * for one that crashes during mount — the key introduced itself before the
+     * crash. Fires once per connection; a client with no hello (an old harness)
+     * still resolves its tester on the first batch via `onEvents`.
+     */
+    onAttribute?: (tags: EventTags) => void;
     /**
      * The tester cap was reached, once per refused session. The CLI prints one
      * line; the connection's events are still stored, just un-attributed.

package/dist/preview/runner.js

@@ -76,6 +76,7 @@ export async function startPreview(opts) {
             projectDir: projectCwd,
             onLog: (m) => onLog(`[relay] ${m}`),
             onEvents: opts.onEvents,
+            onAttribute: opts.onAttribute,
             onCapReached: opts.onCapReached,
         });
         front = createServer((req, res) => {

package/dist/relay/server.d.ts

@@ -24,6 +24,16 @@ export interface RelayOptions {
      * replacement, and a missing handler changes nothing.
      */
     onEvents?: (events: DiagEvent[], tags: EventTags) => void;
+    /**
+     * A connection resolved its tester — on the `hello` at WS-open, before any
+     * batch. This is what lets the CLI print `tester-N connected` on connect, so a
+     * SILENT app (no events at all) and an app that crashes during mount are both
+     * attributed. Fires ONCE per connection, the moment the tester is known; a
+     * connection whose key misses the grammar resolves to no tester and never
+     * fires this. The events path still carries `tester` for un-helloed clients
+     * (an old harness), so attribution is not lost if the hello never arrives.
+     */
+    onAttribute?: (tags: EventTags) => void;
     /**
      * Fires ONCE per refused session when the tester cap is reached, so the CLI
      * can print the one warning line. Once per session rather than once per batch:

package/dist/relay/server.js

@@ -27,8 +27,7 @@ export function startRelay(opts = {}) {
     let annotations;
     let dispatcher;
     if (opts.projectDir || opts.annotationStore) {
-        annotations =
-            opts.annotationStore ?? new AnnotationStore(opts.projectDir);
+        annotations = opts.annotationStore ?? new AnnotationStore(opts.projectDir);
         const queuePath = path.join(opts.projectDir ? annotationsDir(opts.projectDir) : ".", "queue.ndjson");
         dispatcher =
             opts.dispatcher ??
@@ -57,22 +56,41 @@ export function startRelay(opts = {}) {
         // skips.
         const viewer = readViewerLabel(req.headers[VIEWER_STAMP_HEADER]);
         log(viewer ? `client connected · ${viewer}` : "client connected");
-        // The tester is resolved ONCE per connection, from the first batch's key.
-        // Re-resolving per batch would let one socket's events land under two ids if
-        // a client changed its key mid-stream.
+        // The tester is resolved ONCE per connection, from the FIRST key the
+        // connection presents — the `hello` at WS-open, or (for an old harness with
+        // no hello) the first batch. Re-resolving per message would let one socket's
+        // events land under two ids if a client changed its key mid-stream.
+        //
+        // `attribute` grammar-guards the key against CLIENT_SESSION_ID_RE with no
+        // sanitize-and-keep branch: a malformed key resolves to `undefined` (the
+        // connection stays live and un-keyed), and the raw key is only ever a map
+        // lookup inside the registry — it reaches no sink, exactly as the batch key
+        // and the readViewerLabel discipline require.
         let tester;
         let resolved = false;
+        const resolveTester = (sessionId) => {
+            if (resolved)
+                return;
+            resolved = true;
+            const attribution = testers.attribute(sessionId);
+            tester = attribution.tester;
+            if (attribution.warnCapReached)
+                opts.onCapReached?.();
+        };
         ws.on("message", (data) => {
             try {
                 const msg = JSON.parse(String(data));
+                if (msg.type === "hello") {
+                    // Resolve on connect, before any batch — the whole point of the hello.
+                    // A well-formed key mints/looks-up the tester and announces it; a
+                    // malformed one resolves to undefined and announces nothing.
+                    resolveTester(msg.sessionId);
+                    if (tester !== undefined)
+                        opts.onAttribute?.({ viewer, tester });
+                    return;
+                }
                 if (msg.type === "events" && Array.isArray(msg.events)) {
-                    if (!resolved) {
-                        resolved = true;
-                        const attribution = testers.attribute(msg.sessionId);
-                        tester = attribution.tester;
-                        if (attribution.warnCapReached)
-                            opts.onCapReached?.();
-                    }
+                    resolveTester(msg.sessionId);
                     store.ingest(msg.events, { viewer, tester });
                     opts.onEvents?.(msg.events, { viewer, tester });
                 }
@@ -129,7 +147,9 @@ function handleQuery(req, res, url, ctx) {
     readQuery(req, url)
         .then((q) => {
         const result = ctx.store.query(q);
-        res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify(result));
+        res
+            .writeHead(200, { "content-type": "application/json" })
+            .end(JSON.stringify(result));
     })
         .catch((err) => {
         ctx.log(`query error: ${err}`);
@@ -145,7 +165,9 @@ function handleAnnotationPost(req, res, ctx) {
     readBody(req, MAX_ANNOTATION_BYTES)
         .then(async (body) => {
         const input = JSON.parse(body);
-        if (!input || typeof input.message !== "string" || typeof input.screenshot !== "string") {
+        if (!input ||
+            typeof input.message !== "string" ||
+            typeof input.screenshot !== "string") {
             res.writeHead(400).end("annotation requires message + screenshot");
             return;
         }

package/dist/shared/config.d.ts

@@ -1,6 +1,8 @@
 export interface MachineConfig {
     /** Base URL of the Vincentt backend API (e.g. https://api.vincentt.studio). */
     apiUrl: string;
+    /** Console origin that serves /cli-auth (e.g. https://vincentt.app); used by `login`. */
+    consoleUrl: string;
     /** Personal access token (bearer) for machine auth. */
     pat: string;
     /** Org slug commands act in when no --org flag or VINCENTT_ORG env is given. */

package/dist/shared/config.js

@@ -1,7 +1,7 @@
 // Config the lifecycle MCP verbs (project_create / project_publish) read to reach
 // a creator's Vincentt backend. Two homes, by sensitivity:
-//   • ~/.vincentt/config.json — machine-global { apiUrl, pat }. The PAT is a
-//     bearer credential, so it lives OUTSIDE any repo (never committed).
+//   • ~/.vincentt/config.json — machine-global { apiUrl, consoleUrl, pat }. The
+//     PAT is a bearer credential, so it lives OUTSIDE any repo (never committed).
 //   • <project>/.vincentt/project.json — the per-tree binding { projectId, slug }.
 //     Gitignored: `git archive HEAD` (the remix path) must NOT carry it, or a
 //     remixer would inherit — and publish over — the original's project.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vincentt-xr/cli",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Vincentt CLI — the vincentt command-line dev loop (login, create, publish, preview, diagnostics, feedback, relay)",
   "license": "UNLICENSED",
   "type": "module",
@@ -24,7 +24,7 @@
     "qrcode": "^1.5.4",
     "ws": "^8.18.0",
     "zod": "^3.23.8",
-    "@vincentt-xr/harness": "1.1.0"
+    "@vincentt-xr/harness": "1.2.0"
   },
   "devDependencies": {
     "@types/qrcode": "^1.5.5",