@cordfuse/crosstalk 7.0.0-alpha.8 → 7.0.0-beta.1

package/template/data/crosstalk.yaml

@@ -0,0 +1,196 @@
+# Crosstalk transport config — the operator-edited file.
+#
+# Schema:
+#
+#   providers:
+#     <provider-name>:
+#       env_file: <relpath>           # optional — dotenv file under transport
+#       env:                          # optional — inline ${VAR} interpolation
+#         <KEY>: ${HOST_VAR}
+#       models:
+#         <model-name>: <cli command>
+#
+# Models are addressed in `<provider>/<model>` form everywhere (--to flag,
+# message `to:` field, workflow plan targets). A bare `<model>` is also
+# accepted when exactly one claimed model has that name; ambiguous bare
+# names fail with a pick-list.
+#
+# Dispatchers (machines) read this file, take the first token of each
+# model's command, and check PATH. Only models whose CLI is installed
+# locally are claimed by that dispatcher.
+#
+# COMMAND CONTRACT — what `<cli command>` means
+# ---------------------------------------------
+# The command is a whitespace-tokenized argv list, NOT a shell pipeline.
+#
+#   - First token = the binary the dispatcher checks PATH for.
+#   - Remaining tokens = static argv passed to that binary.
+#   - The runtime APPENDS the message body as the FINAL positional arg
+#     (stdin fallback when the prompt exceeds 64 KB).
+#   - Quoting (`'…'`, `"…"`), command substitution (`$(…)`), pipes (`|`),
+#     and redirection (`>`, `<`) are NOT interpreted — they pass through
+#     as literal argv characters. `bash -c 'echo X'` will NOT work as
+#     written; the quotes become part of argv.
+#
+# If you need shell features (pipelines, substitution, env expansion in
+# the command itself), write a wrapper script that reads the prompt
+# from $1, drop it inside the container, then reference it:
+#
+#     crosstalk chat --shell
+#       cat > /crosstalk-root/.local/bin/myagent-wrapper <<'WRAP'
+#       #!/usr/bin/env bash
+#       /path/to/real-agent --some-flag "$1"
+#       WRAP
+#       chmod +x /crosstalk-root/.local/bin/myagent-wrapper
+#       exit
+#     crosstalk restart
+#
+# Then in this file:
+#     providers:
+#       custom:
+#         models:
+#           myagent: myagent-wrapper
+#
+# Why `/crosstalk-root/.local/bin/`: it's already on $PATH and lives
+# under the persistent /crosstalk-root volume, so the wrapper survives
+# `crosstalk restart`. /usr/local/bin/ does NOT work — it's in the
+# container's writable layer and gets wiped on every restart.
+# `crosstalk restart` is required after dropping the wrapper so the
+# dispatcher rescans PATH and claims the new model.
+#
+# Absolute paths also work (alpha.12+): an operator can place the
+# wrapper anywhere under /crosstalk-root and reference it as
+#   myagent: /crosstalk-root/wrappers/myagent-wrapper
+# The dispatcher resolves absolute first tokens directly (skipping
+# the PATH walk).
+#
+# Skip-bad-provider (alpha.11+) / skip-bad-model (alpha.12+): typo'd
+# providers and unreachable model binaries are both logged to stderr
+# and skipped — the rest of the registry loads. Check `crosstalk logs`
+# (or `docker logs <container>`) to see which providers / models were
+# rejected and why.
+#
+# Auth: two layouts, pick whichever fits — they coexist per provider.
+#
+#   env_file: <relpath>
+#     Points at a dotenv file under the transport. Engine reads it at
+#     agent spawn and merges KEY=VALUE pairs into the subprocess env.
+#     Operator-edited file holds the raw secrets.
+#
+#   env: { KEY: ${HOST_VAR}, ... }
+#     Inline map. Values MUST be `${HOST_VAR}` references — raw secrets
+#     are refused so the yaml stays committable. Engine resolves each
+#     ${HOST_VAR} from process.env at spawn time. Missing host vars are
+#     dropped silently (the agent CLI surfaces its own auth error). Use
+#     this when you want the provider→credential mapping visible in one
+#     file.
+#
+# Precedence at spawn (last-wins): process.env → env_file → env →
+# dispatchEnv. So `env` overrides `env_file` per-key if both set, and
+# dispatch metadata wins over everything.
+#
+# Tip: agent CLIs accept aliases (sonnet, opus, haiku, etc.) that auto-
+# track the latest model version. Prefer aliases over pinned full names
+# unless you need a specific version.
+
+providers:
+
+  # ── Anthropic (Claude) ─────────────────────────────────────────────
+  # Headless auth env (pick one): CLAUDE_CODE_OAUTH_TOKEN (subscription
+  # token from `claude setup-token`), or ANTHROPIC_API_KEY (Console key).
+  # OAuth token takes precedence when both are set.
+  #
+  # anthropic-personal:
+  #   env_file: auth/anthropic-personal.env
+  #   models:
+  #     sonnet: claude --print --dangerously-skip-permissions --model sonnet
+  #     haiku:  claude --print --dangerously-skip-permissions --model haiku
+  #     opus:   claude --print --dangerously-skip-permissions --model opus
+
+  # ── Google (Gemini CLI) ────────────────────────────────────────────
+  # Headless auth env: GEMINI_API_KEY (from aistudio.google.com/apikey).
+  # Vertex AI / GCA are alternatives — see the gemini-cli docs.
+  #
+  # google-personal:
+  #   env_file: auth/google-personal.env
+  #   models:
+  #     gemini-pro:   gemini --skip-trust --yolo -p --model gemini-1.5-pro
+  #     gemini-flash: gemini --skip-trust --yolo -p --model gemini-1.5-flash
+
+  # ── Inline `env:` block alternative (alpha.10) ─────────────────────
+  # Same per-provider scoping as `env_file:`, but the provider→credential
+  # mapping is visible in this one file. Values are `${VAR}` references
+  # only — raw secrets are rejected at parse time. Resolve from the host
+  # environment (export the var before `crosstalk up`, or set it in your
+  # shell rc / a sourced .env). Useful when running multiple Gemini
+  # accounts so it's obvious which key feeds which provider.
+  #
+  # google-work:
+  #   env:
+  #     GEMINI_API_KEY: ${GOOGLE_WORK_KEY}
+  #   models:
+  #     gemini-work: gemini --skip-trust --yolo -p
+
+  # ── Google (Antigravity CLI — agy) ─────────────────────────────────
+  # Reads GEMINI_API_KEY too. Can share its env_file with the google-*
+  # provider above, or live under a separate provider if you want
+  # different keys for agy vs gemini-cli.
+  #
+  # google-agy:
+  #   env_file: auth/google-personal.env
+  #   models:
+  #     agy: agy --print
+
+  # ── OpenAI (Codex CLI) ─────────────────────────────────────────────
+  # Codex auths via its own credential store at ~/.codex/auth.json, NOT
+  # via env var. Run once via `crosstalk chat --shell`:
+  #   echo "$OPENAI_API_KEY" | codex login --with-api-key
+  # The store persists in /crosstalk-root across container restarts.
+  # No env_file is needed (declare one if you want isolated codex
+  # accounts via HOME swap — express in the cli string itself).
+  #
+  # openai-codex:
+  #   models:
+  #     codex: codex --skip-git-repo-check
+
+  # ── OpenRouter (gateway → many models) ─────────────────────────────
+  # OpenAI-compatible gateway. Use with codex, qwen, opencode (native),
+  # or any other OpenAI-SDK-shaped client.
+  #   OPENAI_API_KEY=sk-or-v1-...
+  #   OPENAI_BASE_URL=https://openrouter.ai/api/v1
+  #
+  # openrouter:
+  #   env_file: auth/openrouter.env
+  #   models:
+  #     qwen3-coder-or: qwen --auth-type openai --yolo --model qwen/qwen3-coder
+  #     opencode-or:    opencode --model qwen/qwen3-coder
+
+  # ── opencode (multi-provider via own config) ───────────────────────
+  # opencode reads native OPENROUTER_API_KEY, or per-provider env
+  # (ANTHROPIC_API_KEY, OPENAI_API_KEY, ...), or its own config at
+  # ~/.config/opencode/. The provider you put it under here decides
+  # which env file it sees at spawn.
+  #
+  # opencode-native:
+  #   env_file: auth/openrouter.env
+  #   models:
+  #     opencode: opencode -p
+
+  # ── Local Ollama (no auth) ─────────────────────────────────────────
+  # OpenAI-compatible endpoint for whatever models are pulled on the
+  # ollama host. Auth is `OPENAI_API_KEY=ollama` (any non-empty string)
+  # + OPENAI_BASE_URL pointing at the ollama instance.
+  #
+  # ollama-local:
+  #   env_file: auth/ollama-local.env
+  #   models:
+  #     qwen-coder-local: qwen --auth-type openai --yolo --model qwen2.5-coder:14b
+
+  # ── Local Ollama via Tailscale (one GPU box serves the swarm) ──────
+  # Same as ollama-local but pointed at a remote ollama via Tailscale.
+  # Operators on multiple machines all share one GPU host.
+  #
+  # ollama-tailnet:
+  #   env_file: auth/ollama-tailnet.env
+  #   models:
+  #     qwen-coder-tailnet: qwen --auth-type openai --yolo --model qwen2.5-coder:14b

package/template/gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+Thumbs.db
+node_modules/
+.turnq/

package/commands/down.js

@@ -1,40 +0,0 @@
-// crosstalk down — stop a transport's container, keep storage.
-//
-// alpha.6: name-resolved. --volumes flag retires (no named volumes in
-// the bind-mount model). Reversible — next `up` resumes against the
-// preserved <base>/<name>/ storage.
-
-import { existsSync } from 'fs';
-import { spawnSync } from 'child_process';
-import { has } from '../lib/argv.js';
-import { requireInitialized, DEFAULT_CONTAINER_NAME } from '../lib/resolve.js';
-
-function usage(exit = 0) {
-  const w = exit === 0 ? process.stdout : process.stderr;
-  w.write(
-`Usage: crosstalk down [--containername <name>]
-
-Stops the engine container for a transport. Storage at <base>/<name>/
-is preserved — next 'crosstalk up' resumes against it. Use
-'crosstalk rm' if you want to wipe storage as well.
-`,
-  );
-  process.exit(exit);
-}
-
-export async function run(argv) {
-  if (has(argv, '--help') || has(argv, '-h')) usage(0);
-
-  const { name, paths } = requireInitialized(argv);
-  if (!existsSync(paths.composeFile)) {
-    process.stderr.write(
-      `crosstalk down: '${name}' has no compose file (never brought up). Nothing to do.\n`,
-    );
-    return 0;
-  }
-
-  const r = spawnSync('docker', ['compose', '-f', paths.composeFile, 'down'], {
-    stdio: 'inherit',
-  });
-  return r.status ?? 1;
-}

package/commands/init.js

@@ -1,243 +0,0 @@
-// crosstalk init — scaffold a transport into <base>/<name>/.
-//
-// alpha.7 rewrite: phased + idempotent. Each phase is independent and
-// safe to re-run; re-init detects missing markers and repairs them.
-// Mac caught bug A in alpha.6 where the api-port file was written at
-// the end of the pipeline, so any disruption (image pull, git failure)
-// left storage existing but unstartable — and re-init silently
-// no-op-ed instead of fixing it.
-//
-// Phases:
-//   1. Storage layout — mkdir subdirs + write api-port. Pure FS, fast,
-//      runs first so the resolver-visible marker exists before anything
-//      else can go wrong.
-//   2. Transport scaffold — `crosstalkd init` in a one-shot container.
-//      Skipped if transport/.git already exists. stdout/stderr captured
-//      (mac's bug B — in-container scaffold output was leaking).
-//   3. Git init + initial commit. Skipped if .git exists.
-//   4. Remote setup if --remote given (errors if a different origin
-//      is already set; idempotent on same-value).
-//   5. Summary.
-//
-// Each phase reports created/skipped/repaired so operators can tell
-// what just happened.
-
-import { mkdirSync, existsSync, writeFileSync, readFileSync } from 'fs';
-import { spawnSync } from 'child_process';
-import { join } from 'path';
-import { has, flag } from '../lib/argv.js';
-import {
-  parseContainerName,
-  storagePaths,
-  pickFreePort,
-  DEFAULT_CONTAINER_NAME,
-} from '../lib/resolve.js';
-
-const DEFAULT_IMAGE = process.env.CROSSTALK_IMAGE
-  ?? 'ghcr.io/cordfuse/crosstalk-server:7.0.0-alpha.8';
-
-function usage(exit = 0) {
-  const w = exit === 0 ? process.stdout : process.stderr;
-  w.write(
-`Usage:
-  crosstalk init [--containername <name>] [--remote <url>]
-
-Creates a new transport on this machine, or repairs an existing
-incomplete one. Idempotent — re-running fills in any missing markers
-without disturbing existing state.
-
-The transport git repo lives at <base>/<name>/transport/ where <base> is:
-  Linux:   $XDG_DATA_HOME/crosstalk/   (or ~/.local/share/crosstalk/)
-  macOS:   ~/Library/Application Support/crosstalk/
-  Windows: %LOCALAPPDATA%\\crosstalk\\
-
-Set CROSSTALK_STORAGE_MODE=system to use the system-wide path (sudo/UAC
-required; intended for headless multi-operator hosts).
-
-Options:
-  --containername <name>   Container name (default: 'crosstalk'). Must be
-                           lowercase alphanumeric + ._- (no leading . or -).
-                           One default + N named containers per machine.
-  --remote <url>           Set git upstream. If a different remote is
-                           already set, errors instead of overwriting.
-  --image <tag>            Override the engine image (default: bundled
-                           GHCR tag; or CROSSTALK_IMAGE env).
-  -c <name>                Shorthand for --containername.
-
-Examples:
-  crosstalk init                                   # default container
-  crosstalk init --containername uat               # second container
-  crosstalk init --remote git\\@github.com:me/t.git # with upstream
-`,
-  );
-  process.exit(exit);
-}
-
-export async function run(argv) {
-  if (has(argv, '--help') || has(argv, '-h')) usage(0);
-
-  let name;
-  try {
-    name = parseContainerName(argv);
-  } catch (err) {
-    process.stderr.write(`crosstalk init: ${err.message}\n`);
-    return 1;
-  }
-
-  const remote = flag(argv, '--remote');
-  const image = flag(argv, '--image') ?? DEFAULT_IMAGE;
-  const paths = storagePaths(name);
-  const report = [];
-
-  // ── Phase 1: Storage layout ────────────────────────────────────────
-  // mkdir is idempotent (recursive: true). Write api-port if absent.
-  // This is the load-bearing fix for bug A — port file lands FIRST,
-  // before anything else can go wrong (image pull, git init, etc.).
-  try {
-    mkdirSync(paths.transportDir,   { recursive: true });
-    mkdirSync(paths.crosstalkRoot,  { recursive: true });
-    mkdirSync(paths.crosstalkState, { recursive: true });
-  } catch (err) {
-    process.stderr.write(
-      `crosstalk init: failed to create storage at ${paths.storageRoot} — ${err.message}\n`,
-    );
-    if (paths.mode === 'system') {
-      process.stderr.write(
-        `  System-mode storage requires write access to ${paths.base}.\n` +
-        `  Try: sudo mkdir -p ${paths.storageRoot} && sudo chown -R $USER ${paths.storageRoot}\n`,
-      );
-    }
-    return 1;
-  }
-
-  let port;
-  if (existsSync(paths.portFile)) {
-    const v = Number(readFileSync(paths.portFile, 'utf-8').trim());
-    if (Number.isInteger(v) && v > 0 && v < 65536) {
-      port = v;
-      report.push(`  api port:   ${port} (existing)`);
-    }
-  }
-  if (!port) {
-    try {
-      port = pickFreePort(name);
-      writeFileSync(paths.portFile, `${port}\n`);
-      report.push(`  api port:   ${port} (allocated)`);
-    } catch (err) {
-      process.stderr.write(`crosstalk init: port allocation failed — ${err.message}\n`);
-      return 1;
-    }
-  }
-
-  // ── Phase 2: Transport scaffold ────────────────────────────────────
-  // The template-scaffold check is "does CROSSTALK-VERSION exist?" NOT
-  // ".git exists" — git init is a separate phase, and the engine refuses
-  // to re-scaffold over an existing CROSSTALK-VERSION (without --force).
-  // Decoupling means a disrupted init (template written, git init never
-  // ran) re-enters Phase 3 cleanly on re-run.
-  const transportGitDir      = join(paths.transportDir, '.git');
-  const crosstalkVersionFile = join(paths.transportDir, 'CROSSTALK-VERSION');
-  if (!existsSync(crosstalkVersionFile)) {
-    const uid = typeof process.getuid === 'function' ? process.getuid() : null;
-    const gid = typeof process.getgid === 'function' ? process.getgid() : null;
-    const userArgs = (uid != null && gid != null) ? ['--user', `${uid}:${gid}`] : [];
-
-    const dockerArgs = [
-      'run', '--rm',
-      '-v', `${paths.transportDir}:/init-target`,
-      ...userArgs,
-      '--entrypoint', 'crosstalkd',
-      image,
-      'init', '/init-target',
-    ];
-
-    // Bug B fix: don't inherit stdio — the engine prints next-steps that
-    // confuse operators ("Transport initialized at /init-target" with
-    // container-internal paths). Capture, show only on failure.
-    const initRun = spawnSync('docker', dockerArgs, { stdio: 'pipe' });
-    if (initRun.status !== 0) {
-      const stderr = initRun.stderr?.toString() ?? '';
-      const stdout = initRun.stdout?.toString() ?? '';
-      process.stderr.write(`crosstalk init: docker run exited ${initRun.status}\n`);
-      if (stderr.trim()) process.stderr.write(`  stderr: ${stderr.trim()}\n`);
-      if (stdout.trim()) process.stderr.write(`  stdout: ${stdout.trim()}\n`);
-      process.stderr.write(`  command was: docker ${dockerArgs.join(' ')}\n`);
-      return initRun.status ?? 1;
-    }
-    report.push(`  template:   scaffolded via ${image}`);
-  } else {
-    report.push(`  template:   present (skipped scaffold)`);
-  }
-
-  // ── Phase 3: Git init + initial commit ─────────────────────────────
-  if (!existsSync(crosstalkVersionFile)) {
-    // Engine init succeeded but didn't leave files. Bail clearly — we
-    // won't proceed to git init on an empty dir.
-    process.stderr.write(
-      `crosstalk init: transport template missing at ${paths.transportDir}\n` +
-      `  Engine init didn't write template files. Try 'crosstalk rm' then re-init.\n`,
-    );
-    return 1;
-  }
-
-  const gitSteps = [
-    ['init', '--quiet', '--initial-branch=main'],
-    ['add', '-A'],
-    ['commit', '--quiet', '-m', 'initial transport'],
-  ];
-  let gitOk = true;
-  for (const args of gitSteps) {
-    const gr = spawnSync('git', args, { cwd: paths.transportDir, stdio: 'pipe' });
-    if (gr.status !== 0) {
-      // 'git init' on existing repo is fine (it re-runs idempotently);
-      // 'add -A' is also idempotent. 'commit' fails when there's
-      // nothing to commit — that means a previous run already committed.
-      // Only the first call (git init) is load-bearing; the rest are
-      // best-effort to populate the initial state.
-      gitOk = false;
-      break;
-    }
-  }
-  report.push(gitOk ? `  git:        initialized + committed` : `  git:        already present (skipped)`);
-
-  // ── Phase 4: Remote setup ──────────────────────────────────────────
-  if (remote) {
-    const cur = spawnSync('git', ['remote', 'get-url', 'origin'], {
-      cwd: paths.transportDir,
-      stdio: 'pipe',
-    });
-    const currentUrl = cur.status === 0 ? cur.stdout.toString().trim() : null;
-    if (!currentUrl) {
-      const rr = spawnSync('git', ['remote', 'add', 'origin', remote], {
-        cwd: paths.transportDir,
-        stdio: 'pipe',
-      });
-      if (rr.status !== 0) {
-        process.stderr.write(
-          `crosstalk init: 'git remote add origin ${remote}' failed — ${rr.stderr?.toString().trim()}\n`,
-        );
-      } else {
-        report.push(`  remote:     ${remote} (added)`);
-      }
-    } else if (currentUrl === remote) {
-      report.push(`  remote:     ${remote} (already set)`);
-    } else {
-      process.stderr.write(
-        `crosstalk init: remote already set to '${currentUrl}'; refusing to overwrite with '${remote}'.\n` +
-        `  Use 'crosstalk status' to see the transport path; cd there and adjust git config manually if intended.\n`,
-      );
-      return 1;
-    }
-  }
-
-  // ── Phase 5: Summary ───────────────────────────────────────────────
-  process.stdout.write(
-    `\nTransport '${name}' ready:\n` +
-    `  storage:    ${paths.storageRoot}\n` +
-    `  transport:  ${paths.transportDir}\n` +
-    `  image:      ${image}\n` +
-    report.join('\n') + '\n' +
-    `\nNext: crosstalk up${name === DEFAULT_CONTAINER_NAME ? '' : ` --containername ${name}`}\n`,
-  );
-  return 0;
-}

package/commands/pull.js

@@ -1,22 +0,0 @@
-// crosstalk pull — refresh the engine image for a transport.
-
-import { existsSync } from 'fs';
-import { spawnSync } from 'child_process';
-import { has } from '../lib/argv.js';
-import { requireInitialized } from '../lib/resolve.js';
-
-export async function run(argv) {
-  if (has(argv, '--help') || has(argv, '-h')) {
-    process.stdout.write('Usage: crosstalk pull [--containername <name>]\n');
-    return 0;
-  }
-  const { name, paths } = requireInitialized(argv);
-  if (!existsSync(paths.composeFile)) {
-    process.stderr.write(`crosstalk pull: '${name}' has no compose file — run 'crosstalk up' first.\n`);
-    return 1;
-  }
-  const r = spawnSync('docker', ['compose', '-f', paths.composeFile, 'pull'], {
-    stdio: 'inherit',
-  });
-  return r.status ?? 1;
-}

package/commands/replies.js

@@ -1,40 +0,0 @@
-// crosstalk replies <relPath> [<relPath>...] — poll reply status.
-//
-// Exit 0 if all targets have REPLIED or FAILED, exit 2 while any PENDING
-// — agents can poll cheaply in a loop. Mirrors crosstalkd replies.
-
-import { apiFor } from '../lib/api-client.js';
-import { reportAndExit } from '../lib/errors.js';
-import { positionals, has } from '../lib/argv.js';
-
-function usage(exit = 0) {
-  const w = exit === 0 ? process.stdout : process.stderr;
-  w.write('Usage: crosstalk replies [--containername <name>] <relPath> [<relPath>...]\n');
-  process.exit(exit);
-}
-
-export async function run(argv) {
-  if (has(argv, '--help') || has(argv, '-h')) usage(0);
-  const api = apiFor(argv);
-  const targets = positionals(argv, ['--containername', '-c']);
-  if (targets.length === 0) usage(1);
-
-  let resp;
-  try {
-    resp = await api.get(`/replies?relPaths=${encodeURIComponent(targets.join(','))}`);
-  } catch (err) {
-    reportAndExit(err, 'crosstalk replies');
-  }
-
-  let pending = 0;
-  for (const r of resp.replies) {
-    if (r.status === 'PENDING') {
-      process.stdout.write(`PENDING  ${r.target}\n`);
-      pending++;
-    } else {
-      const tag = r.status === 'FAILED' ? 'FAILED  ' : 'REPLIED ';
-      process.stdout.write(`${tag} ${r.target}  <- ${r.from} (${r.replyRelPath})\n`);
-    }
-  }
-  return pending > 0 ? 2 : 0;
-}

package/commands/restart.js

@@ -1,29 +0,0 @@
-// crosstalk restart — restart a transport's engine container.
-//
-// Uses `compose up -d --force-recreate` (not `compose restart`) so
-// changes to env_file (e.g. tokens added via `crosstalk auth paste`)
-// are picked up. Plain `compose restart` just stops + starts the same
-// container without re-reading config.
-
-import { existsSync } from 'fs';
-import { spawnSync } from 'child_process';
-import { has } from '../lib/argv.js';
-import { requireInitialized } from '../lib/resolve.js';
-
-export async function run(argv) {
-  if (has(argv, '--help') || has(argv, '-h')) {
-    process.stdout.write('Usage: crosstalk restart [--containername <name>]\n');
-    return 0;
-  }
-  const { name, paths } = requireInitialized(argv);
-  if (!existsSync(paths.composeFile)) {
-    process.stderr.write(`crosstalk restart: '${name}' has no compose file — run 'crosstalk up' first.\n`);
-    return 1;
-  }
-  const r = spawnSync(
-    'docker',
-    ['compose', '-f', paths.composeFile, 'up', '-d', '--force-recreate'],
-    { stdio: 'inherit' },
-  );
-  return r.status ?? 1;
-}