@cabane/companion 0.6.237 → 0.6.239

package/dist/launch.js

@@ -45,7 +45,8 @@ import { dirname as dirname3, isAbsolute, join as join4 } from "path";
 import { z as z2 } from "zod";
 
 // src/pairing.ts
-function isAllowedBaseUrl(raw) {
+var ALLOW_PLAIN_HTTP_HOST_ENV = "CABANE_ALLOW_PLAIN_HTTP_HOST";
+function isAllowedBaseUrl(raw, env = process.env) {
   let url;
   try {
     url = new URL(raw);
@@ -55,10 +56,41 @@ function isAllowedBaseUrl(raw) {
   if (url.protocol === "https:") return true;
   if (url.protocol === "http:") {
     const host = url.hostname.toLowerCase();
-    return host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]";
+    if (host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]")
+      return true;
+    const allowed = plainHttpHost(env);
+    return allowed !== null && host === allowed;
   }
   return false;
 }
+function plainHttpHost(env = process.env) {
+  const raw = env[ALLOW_PLAIN_HTTP_HOST_ENV]?.trim().toLowerCase();
+  if (!raw) return null;
+  if (isSingleLabel(raw) || isPrivateIpv4(raw)) return raw;
+  const bare = raw.startsWith("[") && raw.endsWith("]") ? raw.slice(1, -1) : raw;
+  return privateIpv6(bare);
+}
+function isSingleLabel(host) {
+  return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(host) && !/^\d+$/.test(host);
+}
+function isPrivateIpv4(host) {
+  const m = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(host);
+  if (!m) return false;
+  const [a, b, c, d] = m.slice(1).map(Number);
+  if ([a, b, c, d].some((n) => n > 255)) return false;
+  return a === 10 || a === 172 && b >= 16 && b <= 31 || a === 192 && b === 168;
+}
+function privateIpv6(host) {
+  if (!host.includes(":")) return null;
+  let bracketed;
+  try {
+    bracketed = new URL(`http://[${host}]/`).hostname;
+  } catch {
+    return null;
+  }
+  const first = Number.parseInt(bracketed.slice(1).split(":")[0] || "0", 16);
+  return (first & 65024) === 64512 ? bracketed : null;
+}
 
 // src/prepare-hook.ts
 import { spawn } from "child_process";
@@ -121,10 +153,10 @@ function isRootPath(value) {
   return isAbsolute(value) || value === "~" || value.startsWith("~/");
 }
 var companionConfigSchema = z2.object({
-  // https-enforced (loopback exempt), so a hand-edited config can't put the
-  // device token and prompt on a plaintext channel.
-  baseUrl: z2.string().url().refine(isAllowedBaseUrl, {
-    message: "baseUrl must be https (loopback http is allowed for local dev only)"
+  // https-enforced (loopback, and the one private host a person names, exempt), so a
+  // hand-edited config can't put the device token and prompt on a plaintext channel.
+  baseUrl: z2.string().url().refine((url) => isAllowedBaseUrl(url), {
+    message: `baseUrl must be https (plain http only to this machine, or to the private host ${ALLOW_PLAIN_HTTP_HOST_ENV} names)`
   }),
   // The `cabdev_` device token plaintext — the companion's one durable credential,
   // presented as `Authorization: Bearer <token>` on the device-facing pull +
@@ -133,7 +165,7 @@ var companionConfigSchema = z2.object({
   // the rest of the config; `pair` always writes one.
   deviceToken: z2.string().optional(),
   // Identity hints, learned from the device flow and refreshed on the first
-  // assignments pull. Cosmetic — used for `status`/dashboard display only.
+  // assignments pull. Cosmetic — used for `status` display only.
   deviceId: z2.string().optional(),
   deviceLabel: z2.string().optional(),
   // Optional per-agent machine-local overrides (cwd / prepareHook), keyed by
@@ -145,9 +177,8 @@ var companionConfigSchema = z2.object({
   // silent roster: an agent nobody listed gets no hook and no error, and starts
   // in the operator's `$HOME`.
   prepareHook: prepareHookSchema.optional(),
-  // The CLI ignores both dashboard settings. Desktop uses `dashboardPort`;
-  // `autoOpen` remains parseable for older config files but no longer controls
-  // startup. `logLevel` is pino's level, live-editable.
+  // Nothing reads either dashboard setting any more; both stay parseable so an
+  // older config file still loads. `logLevel` is pino's level, live-editable.
   dashboardPort: z2.number().int().min(1).max(65535).optional(),
   autoOpen: z2.boolean().optional(),
   logLevel: z2.enum(["warn", "info", "debug"]).optional(),

package/dist/postinstall.js

@@ -92,7 +92,8 @@ var ConfigError = class extends CompanionError {
 };
 
 // src/pairing.ts
-function isAllowedBaseUrl(raw) {
+var ALLOW_PLAIN_HTTP_HOST_ENV = "CABANE_ALLOW_PLAIN_HTTP_HOST";
+function isAllowedBaseUrl(raw, env = process.env) {
   let url;
   try {
     url = new URL(raw);
@@ -102,10 +103,41 @@ function isAllowedBaseUrl(raw) {
   if (url.protocol === "https:") return true;
   if (url.protocol === "http:") {
     const host = url.hostname.toLowerCase();
-    return host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]";
+    if (host === "localhost" || host.endsWith(".localhost") || host === "127.0.0.1" || host === "::1" || host === "[::1]")
+      return true;
+    const allowed = plainHttpHost(env);
+    return allowed !== null && host === allowed;
   }
   return false;
 }
+function plainHttpHost(env = process.env) {
+  const raw = env[ALLOW_PLAIN_HTTP_HOST_ENV]?.trim().toLowerCase();
+  if (!raw) return null;
+  if (isSingleLabel(raw) || isPrivateIpv4(raw)) return raw;
+  const bare = raw.startsWith("[") && raw.endsWith("]") ? raw.slice(1, -1) : raw;
+  return privateIpv6(bare);
+}
+function isSingleLabel(host) {
+  return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(host) && !/^\d+$/.test(host);
+}
+function isPrivateIpv4(host) {
+  const m = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(host);
+  if (!m) return false;
+  const [a, b, c, d] = m.slice(1).map(Number);
+  if ([a, b, c, d].some((n) => n > 255)) return false;
+  return a === 10 || a === 172 && b >= 16 && b <= 31 || a === 192 && b === 168;
+}
+function privateIpv6(host) {
+  if (!host.includes(":")) return null;
+  let bracketed;
+  try {
+    bracketed = new URL(`http://[${host}]/`).hostname;
+  } catch {
+    return null;
+  }
+  const first = Number.parseInt(bracketed.slice(1).split(":")[0] || "0", 16);
+  return (first & 65024) === 64512 ? bracketed : null;
+}
 
 // src/prepare-hook.ts
 import { spawn } from "child_process";
@@ -171,10 +203,10 @@ function isRootPath(value) {
   return isAbsolute(value) || value === "~" || value.startsWith("~/");
 }
 var companionConfigSchema = z2.object({
-  // https-enforced (loopback exempt), so a hand-edited config can't put the
-  // device token and prompt on a plaintext channel.
-  baseUrl: z2.string().url().refine(isAllowedBaseUrl, {
-    message: "baseUrl must be https (loopback http is allowed for local dev only)"
+  // https-enforced (loopback, and the one private host a person names, exempt), so a
+  // hand-edited config can't put the device token and prompt on a plaintext channel.
+  baseUrl: z2.string().url().refine((url) => isAllowedBaseUrl(url), {
+    message: `baseUrl must be https (plain http only to this machine, or to the private host ${ALLOW_PLAIN_HTTP_HOST_ENV} names)`
   }),
   // The `cabdev_` device token plaintext — the companion's one durable credential,
   // presented as `Authorization: Bearer <token>` on the device-facing pull +
@@ -183,7 +215,7 @@ var companionConfigSchema = z2.object({
   // the rest of the config; `pair` always writes one.
   deviceToken: z2.string().optional(),
   // Identity hints, learned from the device flow and refreshed on the first
-  // assignments pull. Cosmetic — used for `status`/dashboard display only.
+  // assignments pull. Cosmetic — used for `status` display only.
   deviceId: z2.string().optional(),
   deviceLabel: z2.string().optional(),
   // Optional per-agent machine-local overrides (cwd / prepareHook), keyed by
@@ -195,9 +227,8 @@ var companionConfigSchema = z2.object({
   // silent roster: an agent nobody listed gets no hook and no error, and starts
   // in the operator's `$HOME`.
   prepareHook: prepareHookSchema.optional(),
-  // The CLI ignores both dashboard settings. Desktop uses `dashboardPort`;
-  // `autoOpen` remains parseable for older config files but no longer controls
-  // startup. `logLevel` is pino's level, live-editable.
+  // Nothing reads either dashboard setting any more; both stay parseable so an
+  // older config file still loads. `logLevel` is pino's level, live-editable.
   dashboardPort: z2.number().int().min(1).max(65535).optional(),
   autoOpen: z2.boolean().optional(),
   logLevel: z2.enum(["warn", "info", "debug"]).optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.237",
+  "version": "0.6.239",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",
@@ -16,8 +16,6 @@
   "main": "./dist/cli.js",
   "exports": {
     ".": "./dist/cli.js",
-    "./runtime": "./dist/runtime.js",
-    "./pairing": "./dist/pairing-config.js",
     "./credential-broker": "./dist/credential-broker.js",
     "./package.json": "./package.json",
     "./*": "./*"