@kendoo.agentdesk/agentdesk 0.4.8 → 0.5.1

package/cli/config.mjs

@@ -1,5 +1,5 @@
 // .agentdesk.json config loader
-// Place this file in your project root to customize agent behavior
+// Loads from: DEFAULTS ← server settings ← local .agentdesk.json (local overrides server)
 
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
@@ -37,28 +37,59 @@ const DEFAULTS = {
 
   // Existing agents/bots in the project — declare them so the team knows about them
   // Each entry: { name, role, when, how }
-  // - name: Agent/bot name (e.g., "ReviewBot", "DataSync Agent")
-  // - role: What it does (e.g., "Automated code review on PR creation")
-  // - when: When to use or expect it (e.g., "Triggers on every PR", "Run manually via npm run agent:sync")
-  // - how: How to interact with it (e.g., "Comment /review on a PR", "Set INPUT_MODE=dry-run for testing")
   projectAgents: [],
 
   // Extra prompt instructions appended to the team prompt
   instructions: null,
 };
 
-export function loadConfig(dir) {
+async function fetchServerConfig(projectName, apiKey, serverUrl) {
+  if (!projectName || !apiKey || !serverUrl) return null;
+  try {
+    const res = await fetch(`${serverUrl}/api/projects/${projectName}/settings`, {
+      headers: { "x-api-key": apiKey },
+      signal: AbortSignal.timeout(5000),
+    });
+    if (!res.ok) return null;
+    const data = await res.json();
+    return Object.keys(data).length > 0 ? data : null;
+  } catch {
+    return null;
+  }
+}
+
+export async function loadConfig(dir, opts = {}) {
+  const { apiKey, serverUrl, projectName } = opts;
+
+  // Load local .agentdesk.json
   const configPath = join(dir, ".agentdesk.json");
+  let localConfig = null;
+  if (existsSync(configPath)) {
+    try {
+      localConfig = JSON.parse(readFileSync(configPath, "utf-8"));
+    } catch (err) {
+      console.error(`Warning: Failed to parse .agentdesk.json: ${err.message}`);
+    }
+  }
 
-  if (!existsSync(configPath)) return { ...DEFAULTS };
+  // Fetch server settings
+  const serverConfig = await fetchServerConfig(projectName, apiKey, serverUrl);
 
-  try {
-    const raw = JSON.parse(readFileSync(configPath, "utf-8"));
-    return deepMerge(DEFAULTS, raw);
-  } catch (err) {
-    console.error(`Warning: Failed to parse .agentdesk.json: ${err.message}`);
-    return { ...DEFAULTS };
+  // Merge: DEFAULTS ← server ← local (local overrides server)
+  let config = { ...DEFAULTS };
+  if (serverConfig) config = deepMerge(config, serverConfig);
+  if (localConfig) config = deepMerge(config, localConfig);
+
+  // Auto-sync: if local config exists but server is empty, push local to server
+  if (localConfig && !serverConfig && apiKey && serverUrl && projectName) {
+    fetch(`${serverUrl}/api/projects/${projectName}/settings`, {
+      method: "PUT",
+      headers: { "Content-Type": "application/json", "x-api-key": apiKey },
+      body: JSON.stringify(localConfig),
+    }).catch(() => {});
   }
+
+  return config;
 }
 
 function deepMerge(defaults, overrides) {

package/cli/init.mjs

@@ -141,6 +141,15 @@ export async function runInit(cwd) {
     if (res.ok) {
       console.log("  Registered with agentdesk.live");
     }
+    // Push settings to server
+    const key = loadApiKey(cwd);
+    if (key) {
+      await fetch(`${SERVER}/api/projects/${projectId}/settings`, {
+        method: "PUT",
+        headers: { "Content-Type": "application/json", "x-api-key": key },
+        body: JSON.stringify(merged),
+      }).catch(() => {});
+    }
   } catch {
     // Server not available
   }

package/cli/team.mjs

@@ -33,9 +33,13 @@ export async function runTeam(taskId, opts = {}) {
   const cwd = opts.cwd || process.cwd();
   const description = opts.description || "";
 
-  // Detect project and load config
+  // Detect project and resolve API key early (needed for server config fetch)
   const project = detectProject(cwd);
-  const config = loadConfig(cwd);
+  const projectEnv = loadDotEnv(cwd);
+  const apiKey = projectEnv.AGENTDESK_API_KEY || process.env.AGENTDESK_API_KEY || getStoredApiKey() || null;
+  const agentdeskServer = process.env.AGENTDESK_SERVER || "https://agentdesk.live";
+
+  const config = await loadConfig(cwd, { apiKey, serverUrl: agentdeskServer, projectName: project.name });
   const tracker = config.tracker || (project.hasLinear ? "linear" : null);
 
   // If no task ID, handle based on tracker
@@ -135,10 +139,7 @@ export async function runTeam(taskId, opts = {}) {
     prompt += `\n\n## ADDITIONAL INSTRUCTIONS\n\n${config.instructions}\n`;
   }
 
-  // --- AgentDesk config ---
-  const projectEnv = loadDotEnv(cwd);
-  const apiKey = projectEnv.AGENTDESK_API_KEY || process.env.AGENTDESK_API_KEY || getStoredApiKey() || null;
-  const agentdeskServer = process.env.AGENTDESK_SERVER || "https://agentdesk.live";
+  // --- AgentDesk WebSocket config ---
   const AGENTDESK_URL = process.env.AGENTDESK_URL || "wss://agentdesk.live/ws/agent";
   const sessionId = `${taskId}-${randomUUID().slice(0, 8)}`;
   const inboxUrl = `${agentdeskServer}/api/sessions/${sessionId}/inbox`;
@@ -173,48 +174,66 @@ export async function runTeam(taskId, opts = {}) {
     }
   }
 
-  try {
-    vizWs = new WebSocket(AGENTDESK_URL);
-    vizWs.on("open", () => {
-      // Authenticate via first message (proxy-safe — query params can be stripped)
-      if (apiKey) {
-        vizWs.send(JSON.stringify({ type: "auth", apiKey }));
-      }
-    });
-    vizWs.on("message", (raw) => {
-      let msg;
-      try { msg = JSON.parse(raw.toString()); } catch { return; }
-      if (msg.type === "auth:ok") {
-        vizConnected = true;
-        console.log("AgentDesk: connected");
-        vizSend({
-          type: "session:start",
-          taskId,
-          taskLink,
-          title: description || taskId,
-          project: project.name || null,
-          sessionNumber: 1,
-          agents: ["Jane", "Dennis", "Bart", "Vera", "Sam", "Luna", "Mark"],
-        });
-        while (vizQueue.length > 0 && vizWs.readyState === WebSocket.OPEN) {
-          vizWs.send(vizQueue.shift());
+  let sessionStartSent = false;
+  let reconnectTimer = null;
+
+  function connectWs() {
+    try {
+      vizWs = new WebSocket(AGENTDESK_URL);
+      vizWs.on("open", () => {
+        if (apiKey) {
+          vizWs.send(JSON.stringify({ type: "auth", apiKey }));
         }
-      } else if (msg.type === "auth:error") {
-        console.log("AgentDesk: authentication failed — run 'agentdesk login'");
+      });
+      vizWs.on("message", (raw) => {
+        let msg;
+        try { msg = JSON.parse(raw.toString()); } catch { return; }
+        if (msg.type === "auth:ok") {
+          vizConnected = true;
+          if (!sessionStartSent) {
+            console.log("AgentDesk: connected");
+          } else {
+            console.log("AgentDesk: reconnected");
+          }
+          // Always re-send session:start on (re)connect so server knows about the session
+          vizSend({
+            type: "session:start",
+            taskId,
+            taskLink,
+            title: description || taskId,
+            project: project.name || null,
+            sessionNumber: 1,
+            agents: ["Jane", "Dennis", "Bart", "Vera", "Sam", "Luna", "Mark"],
+          });
+          sessionStartSent = true;
+          while (vizQueue.length > 0 && vizWs.readyState === WebSocket.OPEN) {
+            vizWs.send(vizQueue.shift());
+          }
+        } else if (msg.type === "auth:error") {
+          console.log("AgentDesk: authentication failed — run 'agentdesk login'");
+          vizConnected = false;
+        }
+      });
+      vizWs.on("error", () => { vizConnected = false; });
+      vizWs.on("close", (code) => {
         vizConnected = false;
-      }
-    });
-    vizWs.on("error", () => { vizConnected = false; });
-    vizWs.on("close", (code) => {
-      vizConnected = false;
-      if (code === 4001) {
-        console.log("AgentDesk: authentication required — run 'agentdesk login'");
-      }
-    });
-  } catch {
-    // AgentDesk not running
+        if (code === 4001) {
+          console.log("AgentDesk: authentication required — run 'agentdesk login'");
+          return; // Don't reconnect on auth failure
+        }
+        // Auto-reconnect after 5 seconds
+        clearTimeout(reconnectTimer);
+        reconnectTimer = setTimeout(connectWs, 5000);
+      });
+    } catch {
+      // AgentDesk not running — retry in 10s
+      clearTimeout(reconnectTimer);
+      reconnectTimer = setTimeout(connectWs, 10000);
+    }
   }
 
+  connectWs();
+
   // --- Spawn Claude ---
   const child = spawn(
     "claude",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kendoo.agentdesk/agentdesk",
-  "version": "0.4.8",
+  "version": "0.5.1",
   "description": "AI team orchestrator for Claude Code — run collaborative agent sessions from your terminal",
   "type": "module",
   "bin": {