@cabane/cli 0.1.5 → 0.1.7

package/dist/cli.js

@@ -1029,14 +1029,23 @@ async function setupAgent(opts) {
   const client = makeClient(base, token);
   const me = await client.get("/api/auth/me");
   ok(`owner resolved (${me.user.id})`);
-  const agentName = await defaultAgentName(client);
-  ok("setup complete");
+  const assignment = await defaultAgentAssignment(client);
   info("");
-  info(`Your agent (@${agentName}) has no executor yet \u2014 agents run on a companion you pair,`);
-  info("the same way they do on hosted Cabane. To bring it to life:");
+  if (assignment.kind === "unavailable") {
+    info("Agent assignment could not be checked. Open Cabane to verify it.");
+    return;
+  }
+  const { username, executor } = assignment.agent;
+  if (executor.deviceId) {
+    info(`Agent @${username} is assigned to ${executor.deviceLabel}.`);
+    return;
+  }
+  info(`Agent @${username} has no device assigned.`);
   info("  1. Install the Companion \u2014 the desktop app, or the headless `@cabane/companion`.");
   info(`  2. Sign in against this instance (${instanceUrl}) and pair the device.`);
-  info(`  3. Assign @${agentName} to one of its connectors, then message it in the app.`);
+  info(
+    `  3. Assign @${username} to the device, then choose a connector on it and message the agent in the app.`
+  );
 }
 async function healthy(port) {
   try {
@@ -1054,18 +1063,24 @@ async function resolvePat(opts, base) {
   }
   throw new Error("no access token. Pass --token <cab_\u2026> (mint it in Settings \u2192 Developer).");
 }
-async function defaultAgentName(client) {
+var BUILTIN_AGENT_USERNAME = "woody";
+function selectSetupAgent(workspace, agents) {
+  return workspace.defaultAgentId && agents.find((a) => a.id === workspace.defaultAgentId) || agents.find((a) => a.username === BUILTIN_AGENT_USERNAME) || agents[0];
+}
+async function defaultAgentAssignment(client) {
   try {
     const { workspaces } = await client.get("/api/workspaces");
     const workspace = workspaces.find((w) => w.role === "owner") ?? workspaces[0];
-    if (!workspace) return "cabane";
+    if (!workspace) return { kind: "unavailable" };
     const { agents } = await client.get(
       `/api/workspaces/${workspace.id}/agents`
     );
-    const agent = workspace.defaultAgentId && agents.find((a) => a.id === workspace.defaultAgentId) || agents.find((a) => a.username === "cabane") || agents[0];
-    return agent?.username ?? "cabane";
+    const agent = selectSetupAgent(workspace, agents);
+    if (!agent?.username || !agent.executor) return { kind: "unavailable" };
+    if (agent.executor.deviceId && !agent.executor.deviceLabel) return { kind: "unavailable" };
+    return { kind: "resolved", agent };
   } catch {
-    return "cabane";
+    return { kind: "unavailable" };
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "description": "The cabane CLI — install, run, and update a self-hosted Cabane on your own machine (server + embedded Postgres; agents run on a companion you pair).",
   "license": "UNLICENSED",