oysterun 1.6.0-beta.21 → 1.6.0-beta.23

package/README.md

@@ -130,7 +130,6 @@ Oysterun through its supported CLI rather than direct Host API calls:
 
 - `skills/oysterun-sessions`
 - `skills/oysterun-session-chat`
-- `skills/oysterun-find-context`
 - `skills/oysterun-scheduler`
 - `skills/oysterun-notifications`
 - `skills/oysterun-mail`
@@ -248,9 +247,7 @@ npm start
 Useful commands:
 
 ```bash
-npm run setup   # first-run Managed Tunnel Host setup
-node host-service/setup.mjs   # source-local Direct Host setup
-node bin/oysterun.mjs setup --local   # explicit local-only Direct setup
+npm run setup   # first-run Managed Tunnel Host setup (the only setup path)
 npm start       # plain start, no watch mode
 npm run dev     # watch mode for Host JS files
 npm run cli     # local CLI client
@@ -270,11 +267,9 @@ Port notes:
 - phone app verification can use any running Host port; point the app at the actual user-approved port for that run
 - backend URL default is `http://localhost:8000`
 - Host config is stored in `~/.oysterun/config.json`
-- direct mode can also store an optional `public_base_url` there for manual client connection
 - fresh Session Setup runtime defaults, including interface style plus Claude/Codex provider defaults, are stored there under `session_defaults`
 - Host Preferences shows the active config path, so `OYSTERUN_CONFIG_DIR` overrides are visible in the UI
-- release setup defaults to Oysterun Managed Tunnel
-- source-local setup and `oysterun setup --local` retain explicit Direct mode
+- every setup registers the Host with Oysterun Managed Tunnel; the registered Tunnel URL is the Host's formal address for the web, the App, login QR codes, the CLI and Agents (P296). The local listener and loopback health URLs remain internal addresses.
 
 ### Optional: start backend + Host together for repo development
 

package/bin/oysterun.mjs

@@ -2,11 +2,14 @@
 
 import { existsSync, readFileSync } from "node:fs";
 import { spawnSync } from "node:child_process";
-import { dirname, join, resolve } from "node:path";
+import { dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import {
   getConfigPath,
+  getConfigDir,
   readRawConfigSource,
+  readDashboardCredentials,
+  readCloudIdentity,
 } from "../host-service/config.mjs";
 import {
   PRODUCT_CLI_MODULES,
@@ -56,10 +59,11 @@ function run(command, args, { setupInput = false } = {}) {
 }
 
 function runSetup(args = []) {
-  const setupArgs = args.includes("--local")
-    ? args.filter((arg) => arg !== "--local")
-    : ["--release-setup", ...args];
-  run(process.execPath, [setupScript, ...setupArgs]);
+  if (args.includes("--local")) {
+    console.error("oysterun: setup --local was removed; `oysterun setup` registers this Host with Oysterun Managed Tunnel.");
+    process.exit(2);
+  }
+  run(process.execPath, [setupScript, "--release-setup", ...args]);
 }
 
 function runService(command, args = []) {
@@ -149,23 +153,25 @@ function inspectConfig() {
     return {
       configured: false,
       configPath,
-      missing: ["config.json"],
+      // Name the layout-aware file actually checked (config/host.json on v2).
+      missing: [relative(getConfigDir(), configPath)],
       raw: {},
     };
   }
 
-  const raw = readRawConfigSource();
+  const raw = { ...readRawConfigSource(), ...readDashboardCredentials() };
   const missing = [];
   const port = Number(raw.port);
   if (!Number.isInteger(port) || port <= 0) missing.push("port");
   if (!isNonEmptyString(raw.dashboard_password_hash)) {
     missing.push("dashboard_password_hash");
   }
-  if (
-    !isNonEmptyString(raw.direct_host_url) &&
-    !isNonEmptyString(raw.public_base_url)
-  ) {
-    missing.push("direct_host_url or public_base_url");
+  // A configured Host has its registered identity and formal Tunnel URL.
+  const identity = readCloudIdentity();
+  if (!isNonEmptyString(raw.managed_endpoint)) missing.push("managed_endpoint");
+  if (!isNonEmptyString(identity.device_id || identity.host_id) ||
+      !isNonEmptyString(identity.device_token || identity.host_credential)) {
+    missing.push("registered Host identity");
   }
 
   return {
@@ -222,8 +228,9 @@ Product modules:
 
 Chat transcript reads:
   chat recent|messages|messages-around|search [--session-id <exact_id>]
-  A verified live Agent can read its Agent's stopped/history target without
-  starting it. History names are unsupported; use an exact retained Session ID.
+  A verified live Session can read any retained stopped Session, of any Agent,
+  without starting it. History names are unsupported; use an exact retained
+  Session ID (list them with: sessions history [--limit 1..100]).
   chat messages --session-id <history_id> [--limit 20] [--next-batch <opaque>]
   History page limits are 1..100; live messages retain --after-seq.
   History read authority does not authorize send, loop, profile or lifecycle.
@@ -236,9 +243,8 @@ Session tags:
 
 First run:
   If Host config is missing or incomplete, 'oysterun' enters setup.
-  Release setup uses Oysterun Managed Tunnel by default.
-  Use 'oysterun setup --local' for local-only Direct Host setup.
-  Use '--enable-cloud-direct' only for advanced Direct Cloud registration.
+  Setup registers this Host with Oysterun Managed Tunnel; its Tunnel URL is the
+  Host address used by the web, the App, QR login, the CLI and Agents.
 
 Install contract:
   npm install -g oysterun installs files only. It does not run setup or start
@@ -296,7 +302,7 @@ function runUninstall(args = []) {
   }
 
   const configPath = getConfigPath();
-  const configDir = dirname(configPath);
+  const configDir = getConfigDir();
   const defaultBrowsePath = readConfiguredDefaultBrowsePath();
   const deleteConfig = options.confirm === "DELETE";
   if (deleteConfig) {
@@ -379,10 +385,7 @@ function runUninstall(args = []) {
 
 function printConfiguredStatus(status) {
   const config = status.raw;
-  const url =
-    config.direct_host_url ||
-    config.public_base_url ||
-    (config.port ? `http://localhost:${config.port}` : "(unknown)");
+  const url = config.managed_endpoint || "(not registered)";
   console.log("Oysterun Host is configured.");
   console.log(`Config: ${status.configPath}`);
   console.log(`Web:    ${url}/app/sessions`);

package/dev/client/connectivity/host-connection-feedback.mjs

@@ -20,7 +20,9 @@ export function normalizeHostConnectionStatus(status = {}) {
     ["closed", "disconnected", "recovering", "unavailable"].includes(
       status.connection_state
     );
-  let qualifier = "Direct Host";
+  // P296: a page not opened through the Tunnel URL reaches the Host on a
+  // local address; this is a status description, not a separate entry.
+  let qualifier = "Local address";
   if (originKind === "managed_endpoint") {
     qualifier =
       activePathKind === "webrtc" ? "Managed WebRTC" : "Managed Endpoint";

package/dev/client/connectivity/logical-host-connection.mjs

@@ -334,6 +334,7 @@ export class OysterunLogicalHostConnection {
       syncOwnerId = null,
       timeoutMs = undefined,
       onUploadProgress = null,
+      onDispatch = null,
     } = {}
   ) {
     if (this.closed) throw new Error("Logical Host connection is closed");
@@ -349,6 +350,9 @@ export class OysterunLogicalHostConnection {
     const isMatrixSync = MATRIX_SYNC_PATH.test(request.path);
     const startedAt = Date.now();
     const releaseTransport = this.acquireTransportLease(transport);
+    // P308: report the transport that really carries this request; the caller
+    // decodes and meters by it, not by the path it saw before awaiting the body.
+    onDispatch?.({ pathKind });
     this.emitDiagnostic({
       event_type: isMatrixSync
         ? "matrix_sync_request_started"

package/dev/client/connectivity/managed-host-browser.mjs

@@ -816,6 +816,17 @@ function responseFromBootstrapLogicalResult(result) {
   });
 }
 
+// P308: the response envelope belongs to the transport that carried the request.
+function responseFromDispatchedLogicalResult(result, dispatchedPathKind) {
+  return dispatchedPathKind === "webrtc"
+    ? responseFromLogicalResult(result)
+    : responseFromBootstrapLogicalResult(result);
+}
+
+function transportAccountingKind(pathKind) {
+  return pathKind === "webrtc" ? "datachannel" : "bootstrap";
+}
+
 function logicalResultBodyByteLength(result) {
   if (result?.response?.body instanceof Uint8Array) {
     return result.response.body.byteLength;
@@ -2480,7 +2491,7 @@ export class ManagedHostBrowserConnection {
             }
           : {}),
       };
-      recordTransportRequest(this.accounting, "bootstrap", path);
+      let dispatchedPathKind = "bootstrap";
       let result;
       try {
         result = await this.logicalConnection.request(requestPayload, {
@@ -2488,6 +2499,14 @@ export class ManagedHostBrowserConnection {
           syncOwnerId: MATRIX_SYNC_PATH.test(path)
             ? this.ensureSyncOwner()
             : null,
+          onDispatch: ({ pathKind }) => {
+            dispatchedPathKind = pathKind;
+            recordTransportRequest(
+              this.accounting,
+              transportAccountingKind(pathKind),
+              path
+            );
+          },
         });
       } catch (error) {
         if (error?.code === HOST_UNAVAILABLE_RESPONSE_ERROR) {
@@ -2525,10 +2544,13 @@ export class ManagedHostBrowserConnection {
         }
         throw error;
       }
-      const response = responseFromBootstrapLogicalResult(result);
+      const response = responseFromDispatchedLogicalResult(
+        result,
+        dispatchedPathKind
+      );
       recordTransportResponseBytes(
         this.accounting,
-        "bootstrap",
+        transportAccountingKind(dispatchedPathKind),
         logicalResultBodyByteLength(result),
         path
       );
@@ -2550,6 +2572,10 @@ export class ManagedHostBrowserConnection {
       signal: request.signal,
       ...(body ? { body } : {}),
     };
+    // The body await above can outlast the WebRTC path (page backgrounded, peer
+    // closed); the logical connection then dispatches on bootstrap. Decode and
+    // meter by the transport that actually carried the request (P308).
+    let dispatchedPathKind = "webrtc";
     const result = await this.logicalConnection.request(requestPayload, {
       requestId: createConnectivityRandomId(),
       syncOwnerId: MATRIX_SYNC_PATH.test(path) ? this.ensureSyncOwner() : null,
@@ -2559,15 +2585,19 @@ export class ManagedHostBrowserConnection {
         ? BULK_REQUEST_TIMEOUT_MS
         : undefined,
       onUploadProgress: recovery.onUploadProgress || null,
+      onDispatch: ({ pathKind }) => {
+        dispatchedPathKind = pathKind;
+      },
     });
-    recordTransportRequest(this.accounting, "datachannel", path);
+    const accountingKind = transportAccountingKind(dispatchedPathKind);
+    recordTransportRequest(this.accounting, accountingKind, path);
     recordTransportResponseBytes(
       this.accounting,
-      "datachannel",
+      accountingKind,
       logicalResultBodyByteLength(result),
       path
     );
-    return responseFromLogicalResult(result);
+    return responseFromDispatchedLogicalResult(result, dispatchedPathKind);
   }
 
   status() {