@shipers-dev/multi 0.1.1 → 0.2.0

package/dist/index.js

@@ -71,21 +71,25 @@ async function getVersion(path) {
 }
 
 // src/client.ts
+var authToken = null;
+function setAuthToken(token) {
+  authToken = token;
+}
 async function request(url, options) {
   try {
-    const response = await fetch(url, {
-      ...options,
-      headers: {
-        "Content-Type": "application/json",
-        ...options?.headers
-      }
-    });
-    const raw = await response.json();
+    const headers = {
+      "Content-Type": "application/json",
+      ...options?.headers
+    };
+    if (authToken && !headers["Authorization"])
+      headers["Authorization"] = `Bearer ${authToken}`;
+    const response = await fetch(url, { ...options, headers });
+    const raw = await response.json().catch(() => ({}));
     if (!response.ok) {
-      return { success: false, error: raw?.error || `HTTP ${response.status}` };
+      return { success: false, error: raw?.error || `HTTP ${response.status}`, status: response.status };
     }
     const data = raw && typeof raw === "object" && "results" in raw ? raw.results : raw;
-    return { success: true, data };
+    return { success: true, data, status: response.status };
   } catch (error) {
     return { success: false, error: String(error) };
   }
@@ -5413,9 +5417,11 @@ async function main() {
   }
   const apiUrl = args.values.api || process.env.MULTI_API_URL || "https://multi-api.adnb3r.workers.dev";
   const config = loadConfig();
+  if (config.token)
+    setAuthToken(config.token);
   switch (command) {
     case "setup":
-      await cmdSetup(args.values.name, args.values.workspace, apiUrl);
+      await cmdSetup(args.values.name, apiUrl);
       break;
     case "connect":
     case "start":
@@ -5466,12 +5472,8 @@ Examples:
   multi-agent connect
 `);
 }
-async function cmdSetup(name, workspaceId, apiUrl) {
+async function cmdSetup(name, apiUrl) {
   ensureDirs();
-  if (!workspaceId) {
-    console.log("\u274C Workspace ID required. Run: multi-agent setup --workspace <id>");
-    process.exit(1);
-  }
   console.log("\uD83D\uDD0D Detecting local agent runtimes...");
   const detected = await detectAgents();
   for (const a of detected)
@@ -5480,23 +5482,62 @@ async function cmdSetup(name, workspaceId, apiUrl) {
     console.log("  (none detected \u2014 stub runtime will be used)");
   const deviceName = name || process.env.HOSTNAME || "Unknown Device";
   console.log(`
-\uD83D\uDCDD Registering device "${deviceName}"...`);
-  const result = await apiClient.post(`${apiUrl}/api/devices/register`, {
-    workspace_id: workspaceId,
+\uD83D\uDCE1 Requesting pairing code for "${deviceName}"...`);
+  const start = await apiClient.post(`${apiUrl}/api/pair/start`, {
     name: deviceName,
     platform: process.platform,
     arch: process.arch,
     os_version: process.version,
     detected_runtimes: detected.map((a) => a.type)
   });
-  if (!result.success || !result.data) {
+  if (!start.success || !start.data) {
     console.log(`
-\u274C Registration failed:`, result.error);
+\u274C Failed to start pairing:`, start.error);
     process.exit(1);
   }
-  console.log(`\u2705 Device registered. ID: ${result.data.id}`);
-  saveConfig({ deviceId: result.data.id, workspaceId, apiUrl });
-  await syncSkills(apiUrl, workspaceId);
+  const { code } = start.data;
+  const pairUrl = `${apiUrl}/pair/${code}`;
+  console.log(`
+\uD83D\uDC49 Open this URL in your browser to approve:
+
+   ${pairUrl}
+`);
+  console.log(`   Or enter code manually: ${code}`);
+  console.log(`
+\u23F3 Waiting for approval (10 min timeout)...`);
+  const deadline = Date.now() + 10 * 60 * 1000;
+  let approved = null;
+  while (Date.now() < deadline) {
+    await sleep(3000);
+    const poll = await apiClient.get(`${apiUrl}/api/pair/poll/${code}`);
+    if (!poll.success) {
+      if (poll.status === 410) {
+        console.log(`
+\u274C Pairing expired. Run setup again.`);
+        process.exit(1);
+      }
+      continue;
+    }
+    if (poll.data?.status === "approved") {
+      approved = { device_id: poll.data.device_id, token: poll.data.token };
+      break;
+    }
+  }
+  if (!approved) {
+    console.log(`
+\u274C Timed out.`);
+    process.exit(1);
+  }
+  console.log(`
+\u2705 Device paired. ID: ${approved.device_id}`);
+  saveConfig({ deviceId: approved.device_id, token: approved.token, apiUrl });
+  setAuthToken(approved.token);
+  const dev = await apiClient.get(`${apiUrl}/api/devices/${approved.device_id}`);
+  const workspaceId = dev.data?.workspace_id;
+  if (workspaceId) {
+    saveConfig({ deviceId: approved.device_id, token: approved.token, workspaceId, apiUrl });
+    await syncSkills(apiUrl, workspaceId);
+  }
   console.log(`
 Next: link to an agent with: multi-agent link --agent <agentId>`);
   console.log("Then: multi-agent connect");
@@ -5549,7 +5590,7 @@ async function cmdConnect(apiUrl, config) {
   log(`\uD83D\uDE80 Connecting device ${config.deviceId} (pid ${process.pid})`);
   log(`   runtimes: ${detected.map((d) => d.type).join(", ") || "stub"}`);
   await apiClient.post(`${apiUrl}/api/devices/${config.deviceId}/heartbeat`, { status: "online" });
-  const wsUrl = apiUrl.replace(/^http/, "ws") + `/ws/devices/${config.deviceId}`;
+  const wsUrl = apiUrl.replace(/^http/, "ws") + `/ws/devices/${config.deviceId}?token=${encodeURIComponent(config.token || "")}`;
   let ws = null;
   let running = true;
   const shutdown = async (reason) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipers-dev/multi",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"

package/src/client.ts

@@ -2,29 +2,35 @@ interface ApiResponse<T = unknown> {
   success: boolean;
   data?: T;
   error?: string;
+  status?: number;
+}
+
+let authToken: string | null = null;
+
+export function setAuthToken(token: string | null) {
+  authToken = token;
 }
 
 async function request<T>(url: string, options?: RequestInit): Promise<ApiResponse<T>> {
   try {
-    const response = await fetch(url, {
-      ...options,
-      headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-      },
-    });
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/json',
+      ...(options?.headers as Record<string, string> | undefined),
+    };
+    if (authToken && !headers['Authorization']) headers['Authorization'] = `Bearer ${authToken}`;
 
-    const raw = await response.json();
+    const response = await fetch(url, { ...options, headers });
+    const raw = await response.json().catch(() => ({}));
 
     if (!response.ok) {
-      return { success: false, error: (raw as any)?.error || `HTTP ${response.status}` };
+      return { success: false, error: (raw as any)?.error || `HTTP ${response.status}`, status: response.status };
     }
 
     const data = (raw && typeof raw === 'object' && 'results' in (raw as any))
       ? (raw as any).results
       : raw;
 
-    return { success: true, data };
+    return { success: true, data, status: response.status };
   } catch (error) {
     return { success: false, error: String(error) };
   }

package/src/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 
 import { detectAgents } from './detect';
-import { apiClient } from './client';
+import { apiClient, setAuthToken } from './client';
 import { runAcp } from './acp-runner';
 import { parseArgs } from 'util';
 import { mkdirSync, existsSync, writeFileSync, readFileSync, appendFileSync, unlinkSync } from 'fs';
@@ -61,10 +61,11 @@ async function main() {
 
   const apiUrl = args.values.api || process.env.MULTI_API_URL || 'https://multi-api.adnb3r.workers.dev';
   const config = loadConfig();
+  if (config.token) setAuthToken(config.token);
 
   switch (command) {
     case 'setup':
-      await cmdSetup(args.values.name, args.values.workspace, apiUrl);
+      await cmdSetup(args.values.name, apiUrl);
       break;
     case 'connect':
     case 'start':
@@ -117,12 +118,8 @@ Examples:
 `);
 }
 
-async function cmdSetup(name?: string, workspaceId?: string, apiUrl?: string) {
+async function cmdSetup(name?: string, apiUrl?: string) {
   ensureDirs();
-  if (!workspaceId) {
-    console.log('❌ Workspace ID required. Run: multi-agent setup --workspace <id>');
-    process.exit(1);
-  }
 
   console.log('🔍 Detecting local agent runtimes...');
   const detected = await detectAgents();
@@ -130,25 +127,53 @@ async function cmdSetup(name?: string, workspaceId?: string, apiUrl?: string) {
   if (!detected.length) console.log('  (none detected — stub runtime will be used)');
 
   const deviceName = name || process.env.HOSTNAME || 'Unknown Device';
-  console.log(`\n📝 Registering device "${deviceName}"...`);
+  console.log(`\n📡 Requesting pairing code for "${deviceName}"...`);
 
-  const result = await apiClient.post<{ id: string }>(`${apiUrl}/api/devices/register`, {
-    workspace_id: workspaceId,
+  const start = await apiClient.post<{ code: string; expires_at: number }>(`${apiUrl}/api/pair/start`, {
     name: deviceName,
     platform: process.platform,
     arch: process.arch,
     os_version: process.version,
     detected_runtimes: detected.map(a => a.type),
   });
-
-  if (!result.success || !result.data) {
-    console.log('\n❌ Registration failed:', result.error);
+  if (!start.success || !start.data) {
+    console.log('\n❌ Failed to start pairing:', start.error);
     process.exit(1);
   }
 
-  console.log(`✅ Device registered. ID: ${result.data.id}`);
-  saveConfig({ deviceId: result.data.id, workspaceId, apiUrl });
-  await syncSkills(apiUrl!, workspaceId);
+  const { code } = start.data;
+  const pairUrl = `${apiUrl}/pair/${code}`;
+  console.log(`\n👉 Open this URL in your browser to approve:\n\n   ${pairUrl}\n`);
+  console.log(`   Or enter code manually: ${code}`);
+  console.log('\n⏳ Waiting for approval (10 min timeout)...');
+
+  const deadline = Date.now() + 10 * 60 * 1000;
+  let approved: { device_id: string; token: string } | null = null;
+  while (Date.now() < deadline) {
+    await sleep(3000);
+    const poll = await apiClient.get<any>(`${apiUrl}/api/pair/poll/${code}`);
+    if (!poll.success) {
+      if (poll.status === 410) { console.log('\n❌ Pairing expired. Run setup again.'); process.exit(1); }
+      continue;
+    }
+    if (poll.data?.status === 'approved') {
+      approved = { device_id: poll.data.device_id, token: poll.data.token };
+      break;
+    }
+  }
+  if (!approved) { console.log('\n❌ Timed out.'); process.exit(1); }
+
+  console.log(`\n✅ Device paired. ID: ${approved.device_id}`);
+  saveConfig({ deviceId: approved.device_id, token: approved.token, apiUrl });
+  setAuthToken(approved.token);
+
+  // Fetch workspace_id from device (now authed)
+  const dev = await apiClient.get<any>(`${apiUrl}/api/devices/${approved.device_id}`);
+  const workspaceId = dev.data?.workspace_id;
+  if (workspaceId) {
+    saveConfig({ deviceId: approved.device_id, token: approved.token, workspaceId, apiUrl });
+    await syncSkills(apiUrl!, workspaceId);
+  }
   console.log('\nNext: link to an agent with: multi-agent link --agent <agentId>');
   console.log('Then: multi-agent connect');
 }
@@ -204,7 +229,7 @@ async function cmdConnect(apiUrl: string, config: Config) {
 
   await apiClient.post(`${apiUrl}/api/devices/${config.deviceId}/heartbeat`, { status: 'online' });
 
-  const wsUrl = apiUrl.replace(/^http/, 'ws') + `/ws/devices/${config.deviceId}`;
+  const wsUrl = apiUrl.replace(/^http/, 'ws') + `/ws/devices/${config.deviceId}?token=${encodeURIComponent(config.token || '')}`;
   let ws: WebSocket | null = null;
   let running = true;
 
@@ -777,6 +802,7 @@ interface Config {
   deviceId?: string;
   workspaceId?: string;
   apiUrl?: string;
+  token?: string;
   // legacy
   agentId?: string;
 }