@kendoo.agentdesk/agentdesk 0.15.5 → 0.15.6

package/CHANGELOG.md

@@ -8,6 +8,11 @@ All user-facing changes to AgentDesk. Each entry is tagged:
 
 Internal refactors, infrastructure changes, and architectural notes are not listed here.
 
+## [0.15.6] — 2026-04-18
+
+### Changed
+- `[CLI]` `.agentdesk.json` is now kept in sync with the server on every CLI run — after fetching the latest settings, the local file is rewritten as a cached view of the authoritative state. Credentials never land on disk. If you edited a field locally and the server had a different value for it, a one-line warning tells you which fields the server overrode so silent drift doesn't hide changes.
+
 ## [0.15.5] — 2026-04-18
 
 ### Added

package/cli/config.mjs

@@ -1,58 +1,44 @@
 // .agentdesk.json config loader
-// Loads from: DEFAULTS ← server settings ← local .agentdesk.json (local overrides server)
-
-import { existsSync, readFileSync } from "fs";
+// Flow:
+//   1. Pull from server (authoritative).
+//   2. Merge DEFAULTS ← local ← server.
+//   3. If local and server both had values for the same non-credential field
+//      but disagreed, print a one-line warning so the user notices server
+//      overrode their edit.
+//   4. Write the merged non-credential config back to .agentdesk.json so the
+//      on-disk file stays a cached view of the server. Credentials never land
+//      on disk — they stay in the server DB, encrypted.
+
+import { existsSync, readFileSync, writeFileSync } from "fs";
 import { join } from "path";
 
 const DEFAULTS = {
-  // Task tracker integration
-  tracker: null,  // "linear" | "jira" | "github" | null
-
-  // Tracker-specific settings
-  linear: {
-    teamKey: null,  // e.g., "KEN"
-    workspace: null, // e.g., "kendoo" — the slug in linear.app/<workspace>/issue/...
-  },
-  jira: {
-    baseUrl: null,  // e.g., "https://mycompany.atlassian.net"
-    project: null,  // e.g., "PROJ"
-  },
-  github: {
-    repo: null,     // e.g., "owner/repo" — auto-detected from git if null
-  },
-
-  // Team composition — array of agent names or custom agent objects
-  // Default: all 8 agents. To customize:
-  //   "team": ["Jane", "Dennis", "Sam", "Bart"]  — 4-agent team (no Luna, Mark, Vera, Nora)
-  //   "team": ["Jane", "Dennis", "Sam", {"name": "Alex", "role": "DevOps Engineer", "description": "..."}]
-  // Jane, Dennis, and Sam are always included even if omitted.
+  tracker: null,
+  linear: { teamKey: null, workspace: null },
+  jira: { baseUrl: null, project: null },
+  github: { repo: null },
   team: null,
-
-  // Commands — auto-detected if null
-  commands: {
-    test: null,
-    build: null,
-    lint: null,
-  },
-
-  // Existing agents/bots in the project — declare them so the team knows about them
-  // Each entry: { name, role, when, how }
+  commands: { test: null, build: null, lint: null },
   projectAgents: [],
-
-  // Capture screenshots for UI tasks (default: on)
   screenshots: true,
-
   // Model per phase — override the phase default.
   // Keys: INTAKE, PLAN, EXECUTION, REVIEW, SUMMARY. Values: "default" | "opus" | "sonnet" | "haiku".
   // Missing entry or "default" falls back to the phase default
   // (sonnet for INTAKE/PLAN/EXECUTION, haiku for REVIEW/SUMMARY).
-  // Example: { "PLAN": "opus", "EXECUTION": "opus", "REVIEW": "sonnet" }
   phaseModels: {},
-
-  // Extra prompt instructions appended to the team prompt
   instructions: null,
 };
 
+// Fields that must never be written to .agentdesk.json. Credentials live only
+// in the server DB, encrypted, and are fetched fresh per-session via the
+// /credentials endpoint.
+const CREDENTIAL_PATHS = [
+  ["linear", "apiKey"],
+  ["jira", "email"],
+  ["jira", "apiToken"],
+  ["github", "token"],
+];
+
 async function fetchServerConfig(projectName, apiKey, serverUrl) {
   if (!projectName || !apiKey || !serverUrl) return null;
   try {
@@ -69,37 +55,119 @@ async function fetchServerConfig(projectName, apiKey, serverUrl) {
 }
 
 export async function loadConfig(dir, opts = {}) {
-  const { apiKey, serverUrl, projectName } = opts;
+  const { apiKey, serverUrl, projectName, silent = false } = opts;
+  const configPath = join(dir, ".agentdesk.json");
 
   // 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 (!silent) console.error(`Warning: Failed to parse .agentdesk.json: ${err.message}`);
     }
   }
 
   // Fetch server settings
   const serverConfig = await fetchServerConfig(projectName, apiKey, serverUrl);
 
+  // Warn on real conflicts before merging: a field the user set locally that
+  // the server overrides with a different value. "Server wins" is the rule,
+  // but silent override is the pattern we're trying to stop.
+  if (!silent && localConfig && serverConfig) {
+    const conflicts = findConflicts(localConfig, serverConfig);
+    if (conflicts.length > 0) {
+      const sample = conflicts.slice(0, 3).map(c => `  ${c.path}: local=${JSON.stringify(c.local)}, server=${JSON.stringify(c.server)}`).join("\n");
+      const extra = conflicts.length > 3 ? `\n  …and ${conflicts.length - 3} more` : "";
+      console.error(`Note: server config overrode local edits in .agentdesk.json:\n${sample}${extra}\nEdit via the UI or re-run \`agentdesk init\` to push local changes.`);
+    }
+  }
+
   // Merge: DEFAULTS ← local ← server (UI is the single source of truth)
   let config = { ...DEFAULTS };
   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
+  // First-time sync: if local exists but server is empty, push local up.
   if (localConfig && !serverConfig && apiKey && serverUrl && projectName) {
-    fetch(`${serverUrl}/api/projects/${projectName}/settings`, {
+    pushConfig(apiKey, serverUrl, projectName, localConfig).catch(() => {});
+  }
+
+  // Cache the merged, credential-free config back to disk so the local file
+  // stays a readable view of the authoritative state. Only when we actually
+  // fetched from the server — offline runs must not silently mutate the
+  // user's local file.
+  if (serverConfig) {
+    writeLocalConfig(configPath, config);
+  }
+
+  return config;
+}
+
+// Push a config object to the server. Caller is responsible for deciding when.
+export async function pushConfig(apiKey, serverUrl, projectName, payload) {
+  if (!apiKey || !serverUrl || !projectName) return { ok: false, error: "missing_auth" };
+  try {
+    const res = await fetch(`${serverUrl}/api/projects/${projectName}/settings`, {
       method: "PUT",
       headers: { "Content-Type": "application/json", "x-api-key": apiKey },
-      body: JSON.stringify(localConfig),
-    }).catch(() => {});
+      body: JSON.stringify(payload),
+      signal: AbortSignal.timeout(5000),
+    });
+    if (!res.ok) {
+      let msg = `HTTP ${res.status}`;
+      try { const data = await res.json(); if (data?.error) msg = data.error; } catch {}
+      return { ok: false, error: msg };
+    }
+    return { ok: true };
+  } catch (err) {
+    return { ok: false, error: err?.message || "network error" };
+  }
+}
+
+function writeLocalConfig(configPath, config) {
+  try {
+    const payload = stripCredentials(config);
+    writeFileSync(configPath, JSON.stringify(payload, null, 2) + "\n", "utf-8");
+  } catch (err) {
+    console.error(`Warning: Failed to write .agentdesk.json: ${err.message}`);
   }
+}
 
-  return config;
+function stripCredentials(config) {
+  const clone = JSON.parse(JSON.stringify(config));
+  for (const [section, field] of CREDENTIAL_PATHS) {
+    if (clone[section] && typeof clone[section] === "object") {
+      delete clone[section][field];
+    }
+  }
+  return clone;
+}
+
+// Walk two configs and return every leaf where both sides have a non-null
+// value and the values disagree. Credential paths are ignored — the server
+// masks them to `••••••` in GET responses, so "conflict" there is spurious.
+function findConflicts(local, server, prefix = "") {
+  const out = [];
+  if (local === null || server === null) return out;
+  const isObj = v => v && typeof v === "object" && !Array.isArray(v);
+  if (isObj(local) && isObj(server)) {
+    for (const key of Object.keys(local)) {
+      const path = prefix ? `${prefix}.${key}` : key;
+      if (isCredentialPath(path)) continue;
+      if (!(key in server)) continue;
+      out.push(...findConflicts(local[key], server[key], path));
+    }
+    return out;
+  }
+  if (JSON.stringify(local) !== JSON.stringify(server)) {
+    out.push({ path: prefix, local, server });
+  }
+  return out;
+}
+
+function isCredentialPath(path) {
+  return CREDENTIAL_PATHS.some(([section, field]) => path === `${section}.${field}`);
 }
 
 function deepMerge(defaults, overrides) {

package/package.json

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