@mattstack/rt-client 0.4.1 → 0.6.0

package/src/settings/identity.ts

@@ -32,79 +32,10 @@ import { runCapture } from "./exec.ts";
 import { machineSettingsPath } from "./paths.ts";
 import { readStore } from "./stores.ts";
 
-// Full-URL forms: scheme://[user[:pass]@]host/path — https, ssh, git, http, ...
-const URL_RE = /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\/(?:[^@/]+@)?([^/]+)\/(.+)$/;
+import { normalizeRemote, type RepoIdentity } from "./identity-codec.ts";
 
-// scp-like scp syntax: [user@]host:path (git@gitlab.com:group/repo.git).
-// Deliberately excludes anything starting with "/" (absolute local paths)
-// so a Windows-drive-letter-free local remote never falsely matches.
-const SCP_RE = /^(?:[^@/\s]+@)?([^:/\s]+):(.+)$/;
-
-export type RepoIdentity =
-  | { kind: "remote"; id: string }
-  | { kind: "path"; id: string };
-
-/**
- * The wire form crosses the daemon socket, sits in board config, and lands in
- * console's `/runs/:repo/...` URL — all of which need one slash-free segment.
- * `encodeURIComponent` guarantees that and is exactly reversible.
- */
-export function serializeIdentity(id: RepoIdentity): string {
-  return `${id.kind}:${encodeURIComponent(id.id)}`;
-}
-
-export function parseIdentity(wire: string): RepoIdentity | null {
-  const colon = wire.indexOf(":");
-  if (colon === -1) return null;
-  const kind = wire.slice(0, colon);
-  if (kind !== "remote" && kind !== "path") return null;
-  const encoded = wire.slice(colon + 1);
-  let id: string;
-  try {
-    id = decodeURIComponent(encoded);
-  } catch {
-    return null;
-  }
-  // Canonical wires only: the id segment must be byte-for-byte what
-  // serializeIdentity emits. Guard sites validate with parseIdentity and then
-  // use the WIRE as a single path component (repoDataDir et al.) — a
-  // hand-built wire with a literal "/" ("path:../..") would otherwise parse
-  // and escape the state directory.
-  if (encodeURIComponent(id) !== encoded) return null;
-  return { kind, id };
-}
-
-/**
- * Pure normalization: `remote` → `host/path` (lowercase host, `.git` and
- * embedded credentials stripped) or null when the remote doesn't match a
- * recognized host form (local paths, garbage input).
- */
-export function normalizeRemote(remote: string): string | null {
-  const trimmed = remote.trim();
-  if (!trimmed) return null;
-
-  let host: string | undefined;
-  let path: string | undefined;
-
-  const urlMatch = URL_RE.exec(trimmed);
-  if (urlMatch) {
-    host = urlMatch[1];
-    path = urlMatch[2];
-  } else if (!trimmed.startsWith("/") && !trimmed.startsWith("~")) {
-    const scpMatch = SCP_RE.exec(trimmed);
-    if (scpMatch) {
-      host = scpMatch[1];
-      path = scpMatch[2];
-    }
-  }
-
-  if (!host || !path) return null;
-
-  const normalizedPath = path.replace(/\.git$/, "").replace(/^\/+/, "").replace(/\/+$/, "");
-  if (!normalizedPath) return null;
-
-  return `${host.toLowerCase()}/${normalizedPath}`;
-}
+export { serializeIdentity, parseIdentity, normalizeRemote } from "./identity-codec.ts";
+export type { RepoIdentity } from "./identity-codec.ts";
 
 /**
  * The sync helper every non-derivation call site uses: machine-store

package/src/settings/registry-defs.ts

@@ -228,6 +228,13 @@ export const REGISTRY: readonly SettingDef[] = [
     merge: "replace",
     description: "Absolute path to the installed mattstack.app bundle, written by the app at launch so rt stops hardcoding ~/Applications.",
   },
+  {
+    key: "mattstack.mode",
+    type: "string",
+    scopes: ["machine"],
+    merge: "replace",
+    description: "The machine's intended flavor, \"dev\" or \"prod\". Normally written by `rt settings dev-mode` after a successful handoff; a manual `rt settings set` is the blessed repair escape hatch — the daemon park loop converges on whatever this says. Unset ⇒ derived from the dev wrapper's presence.",
+  },
   {
     key: "rt.integrations",
     type: "object",

package/src/transport.ts

@@ -19,6 +19,15 @@ export interface RtResponse<T = unknown> {
 export interface RtClientOptions {
   sockPath?: string;
   wsUrl?: string;
+  /** Per-call override of rtCommand's own default (15s); chat's pulse wrapper needs an 800ms hook budget. */
+  timeoutMs?: number;
+  /**
+   * Test seam for createRelay (relay.ts): swaps the daemon subscription for
+   * a fake without a live WebSocket server. Typed structurally against
+   * relay.ts's `subscribe` rather than importing its RelayEventType, which
+   * would make this module depend on the one that already depends on it.
+   */
+  subscribeImpl?: (onEvent: (type: string, data: unknown) => void, opts?: RtClientOptions) => () => void;
 }
 
 // Duplicates the ~/.mattstack/rt layout: rt-client has no dependency on rt's