@cabane/companion 0.6.172 → 0.6.174

package/dist/pairing-config.js

@@ -432,114 +432,53 @@ function saveConfig(cfg) {
 }
 
 // src/enrollment.ts
-var EnrollmentExpiredError = class extends CompanionError {
-  constructor() {
-    super("this pairing code expired before it was confirmed.");
-    this.name = "EnrollmentExpiredError";
-  }
-};
-var EnrollmentCancelledError = class extends CompanionError {
-  constructor() {
-    super("pairing was cancelled.");
-    this.name = "EnrollmentCancelledError";
-  }
-};
-function trimBase(baseUrl) {
-  return baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
-}
-async function postJson(baseUrl, path, body) {
+async function claimSetupCode(baseUrl, input) {
   let res;
   try {
-    res = await fetch(`${trimBase(baseUrl)}${path}`, {
+    res = await fetch(`${baseUrl.replace(/\/$/, "")}/api/device-enrollment/claim`, {
       method: "POST",
-      headers: { "content-type": "application/json", accept: "application/json" },
-      body: JSON.stringify(body)
+      headers: {
+        "content-type": "application/json",
+        ...input.deviceToken ? { authorization: `Bearer ${input.deviceToken}` } : {}
+      },
+      body: JSON.stringify({
+        userCode: input.userCode,
+        label: input.label,
+        platform: process.platform,
+        arch: process.arch,
+        nodeMajor: Number.parseInt(process.versions.node.split(".")[0], 10)
+      })
     });
-  } catch (err) {
+  } catch {
     throw new CompanionError(
-      `couldn't reach cabane at ${baseUrl}: ${err instanceof Error ? err.message : String(err)}. Check the server URL (pass --server <url>) and your connection.`
+      `Couldn't reach Cabane at ${baseUrl}. Check the server URL and your connection.`
     );
   }
-  const raw = await res.text();
-  let parsed = void 0;
-  if (raw.length > 0) {
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      parsed = raw;
-    }
-  }
-  if (res.status >= 400) {
-    if (res.status === 404 && path.endsWith("/code")) {
-      throw new CompanionError(
-        `no device-flow pairing endpoint at ${baseUrl}. Either that server predates \`${cabane("pair")}\`, or it isn't a Cabane API origin \u2014 the hosted app is https://app.cabane.ai (pass \`--server <url>\` for your own instance).`
-      );
-    }
-    const msg = parsed && typeof parsed === "object" && "error" in parsed ? String(parsed.error) : `${res.status}`;
-    throw new ApiError(res.status, `${res.status} ${msg}`, parsed);
-  }
-  return parsed;
-}
-function requestEnrollmentCode(baseUrl, opts = {}) {
-  return postJson(baseUrl, "/api/device-enrollment/code", {
-    ...opts.label ? { label: opts.label } : {},
-    ...hostFacts()
-  });
-}
-function hostFacts() {
-  const nodeMajor = Number.parseInt(process.versions.node.split(".")[0] ?? "", 10);
+  if (res.status === 429)
+    throw new CompanionError(
+      "Too many attempts from this network. Wait a few minutes and paste the setup line again."
+    );
+  if (res.status === 404 && input.deviceToken)
+    throw new CompanionError(
+      "The setup code or saved device credential is unavailable. If this device was removed, run cabane logout, then take a fresh setup line from your workspace\u2019s Settings \u2192 Devices."
+    );
+  if (res.status === 404 || res.status === 410)
+    throw new CompanionError(
+      "That setup code is unavailable. Take a fresh setup line from your workspace\u2019s Settings \u2192 Devices."
+    );
+  if (!res.ok) throw new ApiError(res.status, `Setup failed (${res.status}).`);
+  const body = await res.json();
+  if (!body || typeof body !== "object" || !("baseUrl" in body) || typeof body.baseUrl !== "string" || !("deviceId" in body) || typeof body.deviceId !== "string")
+    throw new CompanionError("Cabane returned an incomplete setup response.");
+  const token = "deviceToken" in body && typeof body.deviceToken === "string" ? body.deviceToken : input.deviceToken;
+  if (!token) throw new CompanionError("Cabane returned no device credential.");
   return {
-    platform: process.platform,
-    arch: process.arch,
-    ...Number.isInteger(nodeMajor) ? { nodeMajor } : {}
+    baseUrl: body.baseUrl,
+    deviceToken: token,
+    deviceId: body.deviceId,
+    ..."deviceLabel" in body && typeof body.deviceLabel === "string" ? { deviceLabel: body.deviceLabel } : {}
   };
 }
-function pollOnce(baseUrl, deviceCode) {
-  return postJson(baseUrl, "/api/device-enrollment/poll", { deviceCode });
-}
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-async function runDeviceFlow(baseUrl, print, opts = {}) {
-  if (opts.signal?.aborted) throw new EnrollmentCancelledError();
-  const code = await requestEnrollmentCode(baseUrl, {
-    ...opts.label ? { label: opts.label } : {}
-  });
-  if (opts.onCode) await opts.onCode(code);
-  print("");
-  print(`  Enter this code at ${code.verificationUri}`);
-  print("");
-  print(`      ${code.userCode}`);
-  print("");
-  print(`  or open: ${code.verificationUriComplete}`);
-  print("");
-  print("Waiting for you to confirm it in Cabane\u2026");
-  return awaitEnrollment(baseUrl, code, opts);
-}
-async function awaitEnrollment(baseUrl, code, opts = {}) {
-  const now = opts.now ?? (() => Date.now());
-  const wait = opts.sleepMs ?? sleep;
-  const deadline = now() + code.expiresIn * 1e3;
-  let intervalMs = Math.max(1, code.interval) * 1e3;
-  while (now() < deadline) {
-    await wait(intervalMs);
-    if (opts.signal?.aborted) throw new EnrollmentCancelledError();
-    const res = await pollOnce(baseUrl, code.deviceCode);
-    if (res.status === "complete") {
-      if (!res.deviceToken || !res.baseUrl) {
-        throw new CompanionError("the server reported the pairing complete but returned no token.");
-      }
-      return {
-        baseUrl: res.baseUrl,
-        deviceToken: res.deviceToken,
-        ...res.deviceId ? { deviceId: res.deviceId } : {},
-        ...res.deviceLabel ? { deviceLabel: res.deviceLabel } : {},
-        ...res.ownerName ? { ownerName: res.ownerName } : {}
-      };
-    }
-    if (res.status === "expired") throw new EnrollmentExpiredError();
-    if (res.status === "slow_down") intervalMs += 1e3;
-  }
-  throw new EnrollmentExpiredError();
-}
 
 // src/pairing-config.ts
 var DEFAULT_BASE_URL = "https://app.cabane.ai";
@@ -574,9 +513,8 @@ function isDevicePaired() {
 export {
   ApiError,
   CompanionError,
+  claimSetupCode,
   isDevicePaired,
-  requestEnrollmentCode,
   resolvePairBaseUrl,
-  runDeviceFlow,
   writePairedConfig
 };

package/dist/runtime.js

@@ -3468,6 +3468,8 @@ var MAX_ASK_OPTION_BYTES = 200;
 var ASK_OPTION_NOT_A_STRING = "An ask option is a plain string label.";
 var MIN_ASK_OPTIONS = 2;
 var MAX_ASK_OPTIONS = 4;
+var ASK_TARGET_PATTERN = /^(?:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}|@?[A-Za-z0-9-]{2,32})$/;
+var ASK_TARGET_INVALID = "An ask target is a user id or an @handle.";
 var MAX_WAKE_NOTE_BYTES = 2e3;
 var MAX_WITHDRAW_REASON_BYTES = 400;
 var MAX_SKIP_REASON_BYTES = 500;
@@ -3479,7 +3481,7 @@ var TURN_CONTROL_TOOLS = [
   "withdraw_ask"
 ];
 var TURN_CONTROL_TOOL_DESCRIPTIONS = {
-  ask: `Ask a person a structured question you need answered to continue, then end your turn; don't wait for the reply. \`targetUserId\` is a person on your roster; to bring in an agent, name it with \`@handle\` in your reply.
+  ask: `Ask a person a structured question you need answered to continue, then end your turn; don't wait for the reply. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name it with \`@handle\` in your reply.
 - Form: one question (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} \`{ headline, body?, options? }\`; never both. Decisions that arise together go in ONE call, in the order you want them answered. A second \`ask\` is a separate item, never an edit; raise one only for a genuinely new question.
 - \`headline\`: one sentence ending in \`?\`. Body (\`question\` or each item's \`body\`): a sentence or two of framing, not a report; inline Markdown only, no lists or headings. \`options\`: ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} one-click answers (always for a yes/no go-ahead), each a distinct course of action you can carry out without asking back.
 - Voice, in headline, body and options: "I" for yourself, never your own name; name everyone else who decides or acts, as on your roster. Never "you", "your", "we", "us", "our" or their contractions, nor "he", "she" or "they" for a named actor. Each option reads correctly alone. A quotation stays accurate: say who said it.
@@ -3494,7 +3496,7 @@ var TURN_CONTROL_TOOL_DESCRIPTIONS = {
 };
 var TURN_CONTROL_FIELD_DESCRIPTIONS = {
   ask: {
-    targetUserId: "The workspace member (human) to ask \u2014 a user id, from your turn context's roster.",
+    targetUserId: "The person to ask: their `@handle` from your turn context's roster (preferred), or their user id.",
     question: `SINGLE-question form: a short body \u2014 one or two sentences of framing the headline can't hold. NOT a report (up to ${MAX_ASK_QUESTION_BYTES} characters, inline markdown only). Provide EITHER this or \`questions\`, not both. Put the crisp one-sentence question in \`headline\`.`,
     headline: `SINGLE-question form: the question itself as ONE clear, capitalized sentence ending in \`?\` ("Should Ledger deploy once Mia approves?"), up to ${MAX_ASK_HEADLINE_BYTES} characters. What the person reads first in For you and on the chip \u2014 one scannable question, no elaboration (that goes in \`question\`). Strongly encouraged.`,
     options: `SINGLE-question form: optional ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} suggested one-click answers, up to ${MAX_ASK_OPTION_BYTES} characters each. Each option must make sense on its own.`,
@@ -9101,7 +9103,7 @@ function createTurnControlMcpServer(acts, skipState) {
         ASK_TOOL,
         TURN_CONTROL_TOOL_DESCRIPTIONS.ask,
         {
-          targetUserId: z17.string().uuid().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.targetUserId),
+          targetUserId: z17.string().regex(ASK_TARGET_PATTERN, { error: ASK_TARGET_INVALID }).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.targetUserId),
           question: z17.string().min(1).max(MAX_ASK_QUESTION_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.question),
           headline: z17.string().min(1).max(MAX_ASK_HEADLINE_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.headline),
           options: z17.array(z17.string({ error: ASK_OPTION_NOT_A_STRING }).min(1).max(MAX_ASK_OPTION_BYTES)).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.options),
@@ -14270,6 +14272,7 @@ var CompanionSupervisor = class {
   async sendHeartbeat() {
     if (!this.deviceApi) return;
     try {
+      if (!this.detection || advertisedRuntimes(this.detection).length === 0) await this.detect();
       const store = loadSecretStoreTolerant(
         (m) => this.log.warn({ err: m }, "Could not read the secrets file. Check ~/.cabane/secrets.json.")
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.172",
+  "version": "0.6.174",
   "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",