@kendoo.agentdesk/agentdesk 0.9.1 → 0.9.3

package/cli/config.mjs

@@ -75,10 +75,10 @@ export async function loadConfig(dir, opts = {}) {
   // Fetch server settings
   const serverConfig = await fetchServerConfig(projectName, apiKey, serverUrl);
 
-  // Merge: DEFAULTS ← server ← local (local overrides server)
+  // Merge: DEFAULTS ← local ← server (UI is the single source of truth)
   let config = { ...DEFAULTS };
-  if (serverConfig) config = deepMerge(config, serverConfig);
   if (localConfig) config = deepMerge(config, localConfig);
+  if (serverConfig) config = deepMerge(config, serverConfig);
 
   // Auto-sync: if local config exists but server is empty, push local to server
   if (localConfig && !serverConfig && apiKey && serverUrl && projectName) {

package/cli/daemon.mjs

@@ -313,7 +313,7 @@ export async function runDaemon() {
 
   // 4. Session handling
 
-  async function handleStartSession({ sessionId, projectId, prompt, mode }) {
+  async function handleStartSession({ sessionId, projectId, taskId: remoteTaskId, prompt, mode }) {
     // Validate project against local allowlist
     const project = projects.find(p => p.id === projectId);
     if (!project) {
@@ -345,13 +345,23 @@ export async function runDaemon() {
       const config = await loadConfig(project.path, { apiKey: projectApiKey, serverUrl: agentdeskServer, projectName: project.name });
       const tracker = config.tracker || (detected.hasLinear ? "linear" : null);
 
-      // Generate task ID
-      const taskId = prompt
+      // Use provided task ID or generate from description
+      const taskId = remoteTaskId || (prompt
         ? prompt.toLowerCase().replace(/[^a-z0-9\s-]/g, "").trim().replace(/\s+/g, "-").slice(0, 40) || `task-${Date.now().toString(36)}`
-        : `daemon-${Date.now().toString(36)}`;
+        : `daemon-${Date.now().toString(36)}`);
 
       // Build task link
       let taskLink = null;
+      if (remoteTaskId) {
+        if (tracker === "linear" && config.linear?.workspace) {
+          taskLink = `https://linear.app/${config.linear.workspace}/issue/${remoteTaskId}`;
+        } else if (tracker === "jira" && config.jira?.baseUrl) {
+          taskLink = `${config.jira.baseUrl}/browse/${remoteTaskId}`;
+        } else if (tracker === "github") {
+          const repo = config.github?.repo || "";
+          if (repo) taskLink = `https://github.com/${repo}/issues/${remoteTaskId}`;
+        }
+      }
 
       // Resolve team
       const team = resolveTeam(config);
@@ -364,15 +374,18 @@ export async function runDaemon() {
       const result = await runOrchestrator({
         taskId, taskLink,
         description: prompt || "",
-        createTask: false,
+        createTask: !remoteTaskId && !!prompt && !!tracker,
         tracker, config,
         project: detected, team, teamSections,
         inboxUrl, sessionUrl,
         cwd: project.path,
         mode: mode || "full",
+        apiKey,
+        serverUrl: agentdeskServer,
         onEvent(event) {
+          // Skip events after cancellation to prevent double session:end
+          if (!activeSession || activeSession.sessionId !== sessionId) return;
           sendBuffered(sessionId, event);
-          // Track file paths for metadata logging
           if (event.type === "tool:use" && event.description) {
             const pathMatch = event.description.match(/(?:Reading|Editing|Writing)\s+(.+)/);
             if (pathMatch) filePathsTouched.add(pathMatch[1]);
@@ -411,8 +424,12 @@ export async function runDaemon() {
   function handleCancelSession({ sessionId }) {
     if (activeSession?.sessionId === sessionId) {
       console.log(`  ${yellow}Cancelling session${reset} ${dim}${sessionId}${reset}`);
+      const duration = `${((Date.now() - activeSession.startedAt) / 1000).toFixed(1)}s`;
       killChild(activeSession.child);
+      // Clear active session BEFORE sending session:end — this prevents
+      // the orchestrator's onEvent callback from sending a duplicate
       activeSession = null;
+      sendBuffered(sessionId, { type: "session:end", duration, steps: 0, inputTokens: 0, outputTokens: 0 });
     }
   }
 

package/cli/orchestrator.mjs

@@ -14,6 +14,19 @@ const CLI_VERSION = JSON.parse(readFileSync(join(__dirname, "../package.json"),
 import { buildAgentPrompt, getAgentTools } from "./agent-prompts.mjs";
 import { detectProject, generateContext } from "./detect.mjs";
 
+// Fetch decrypted tracker credentials from server
+async function fetchTrackerCredentials(projectName, apiKey, serverUrl) {
+  if (!apiKey || !serverUrl || !projectName) return {};
+  try {
+    const res = await fetch(`${serverUrl}/api/projects/${projectName}/settings/credentials`, {
+      headers: { "x-api-key": apiKey },
+      signal: AbortSignal.timeout(5000),
+    });
+    if (res.ok) return await res.json();
+  } catch {}
+  return {};
+}
+
 function loadDotEnv(dir) {
   const envPath = join(dir, ".env");
   if (!existsSync(envPath)) return {};
@@ -37,11 +50,11 @@ function timestamp() {
 export async function runOrchestrator({
   taskId, taskLink, description, createTask, tracker, config,
   project, team, teamSections, inboxUrl, sessionUrl, cwd,
-  onEvent, mode = "full",
+  onEvent, mode = "full", apiKey, serverUrl,
 }) {
   // --- Lite mode: single process, legacy behavior ---
   if (mode === "lite") {
-    return runLiteMode({ taskId, taskLink, description, createTask, tracker, config, project, teamSections, inboxUrl, sessionUrl, cwd, onEvent });
+    return runLiteMode({ taskId, taskLink, description, createTask, tracker, config, project, teamSections, inboxUrl, sessionUrl, cwd, onEvent, apiKey, serverUrl });
   }
 
   // --- Full mode: independent sub-agents ---
@@ -54,7 +67,8 @@ export async function runOrchestrator({
     totalSteps: 0,
   };
 
-  const env = { ...process.env, ...loadDotEnv(cwd) };
+  const trackerCreds = await fetchTrackerCredentials(project?.name, apiKey, serverUrl);
+  const env = { ...process.env, ...loadDotEnv(cwd), ...trackerCreds };
 
   // Emit event to WebSocket (same protocol as single-process mode)
   function emit(event) {
@@ -303,8 +317,9 @@ export async function runOrchestrator({
 
 // --- Lite mode: single Claude process with all agents as personas ---
 
-async function runLiteMode({ taskId, taskLink, description, createTask, tracker, config, project, teamSections, inboxUrl, sessionUrl, cwd, onEvent }) {
-  const env = { ...process.env, ...loadDotEnv(cwd) };
+async function runLiteMode({ taskId, taskLink, description, createTask, tracker, config, project, teamSections, inboxUrl, sessionUrl, cwd, onEvent, apiKey, serverUrl }) {
+  const trackerCreds = await fetchTrackerCredentials(project?.name, apiKey, serverUrl);
+  const env = { ...process.env, ...loadDotEnv(cwd), ...trackerCreds };
   const startTime = Date.now();
   let totalInputTokens = 0;
   let totalOutputTokens = 0;

package/cli/team.mjs

@@ -177,6 +177,8 @@ export async function runTeam(taskId, opts = {}) {
     project, team, teamSections, inboxUrl, sessionUrl, cwd,
     onEvent: vizSend,
     mode: agentMode,
+    apiKey,
+    serverUrl: agentdeskServer,
   });
 
   console.log(`\n━━━ DONE ━━━`);

package/package.json

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