thepopebot 1.2.75-beta.2 → 1.2.75-beta.21

package/lib/chat/components/settings-coding-agents-page.js

@@ -52,6 +52,9 @@ function DefaultAgentSection({ settings, onReload }) {
   if (settings.openCode?.enabled && isOpenCodeReady(settings)) {
     available.push({ value: "opencode", label: "OpenCode" });
   }
+  if (settings.kimiCli?.enabled && isKimiCliReady(settings)) {
+    available.push({ value: "kimi-cli", label: "Kimi CLI" });
+  }
   const handleChange = async (e) => {
     setSaving(true);
     const result = await setCodingAgentDefault(e.target.value);
@@ -99,7 +102,8 @@ function AgentCards({ settings, onReload }) {
       /* @__PURE__ */ jsx(PiCard, { settings, onReload }),
       /* @__PURE__ */ jsx(GeminiCliCard, { settings, onReload }),
       /* @__PURE__ */ jsx(CodexCliCard, { settings, onReload }),
-      /* @__PURE__ */ jsx(OpenCodeCard, { settings, onReload })
+      /* @__PURE__ */ jsx(OpenCodeCard, { settings, onReload }),
+      /* @__PURE__ */ jsx(KimiCliCard, { settings, onReload })
     ] })
   ] });
 }
@@ -687,6 +691,136 @@ function OpenCodeCard({ settings, onReload }) {
     ) })
   ] });
 }
+function KimiCliCard({ settings, onReload }) {
+  const config = settings.kimiCli;
+  const [modelText, setModelText] = useState(config.model || "");
+  const [saved, setSaved] = useState(false);
+  const showSaved = () => {
+    setSaved(true);
+    setTimeout(() => setSaved(false), 2e3);
+  };
+  const handleToggle = async () => {
+    await updateCodingAgentConfig("kimi-cli", { enabled: !config.enabled });
+    await onReload();
+  };
+  const handleProviderChange = async (e) => {
+    const newProvider = e.target.value;
+    const cp = settings?.customProviders?.find((p) => p.key === newProvider);
+    const models = getAgentModels(settings, newProvider);
+    const newModel = models.length > 0 ? models[0].id : cp?.models?.[0] || "";
+    setModelText(newModel);
+    await updateCodingAgentConfig("kimi-cli", { provider: newProvider, model: newModel });
+    await onReload();
+    showSaved();
+  };
+  const handleModelChange = async (e) => {
+    await updateCodingAgentConfig("kimi-cli", { model: e.target.value });
+    await onReload();
+    showSaved();
+  };
+  const handleModelTextSave = async () => {
+    await updateCodingAgentConfig("kimi-cli", { model: modelText });
+    await onReload();
+    showSaved();
+  };
+  const availableProviders = [];
+  if (settings?.builtinProviders && settings?.credentialStatuses) {
+    const statusMap = new Map(settings.credentialStatuses.map((s) => [s.key, s.isSet]));
+    for (const [slug, prov] of Object.entries(settings.builtinProviders)) {
+      const hasKey = prov.credentials.some((c) => statusMap.get(c.key));
+      if (hasKey) {
+        availableProviders.push({ slug, name: prov.name });
+      }
+    }
+  }
+  if (settings?.customProviders) {
+    for (const cp of settings.customProviders) {
+      availableProviders.push({ slug: cp.key, name: cp.name });
+    }
+  }
+  const ready = isKimiCliReady(settings);
+  const selectedProviderReady = availableProviders.some((p) => p.slug === config.provider);
+  const builtinModels = config.provider ? getAgentModels(settings, config.provider) : [];
+  const customProvider = settings?.customProviders?.find((p) => p.key === config.provider);
+  const providerModels = builtinModels.length > 0 ? builtinModels : (customProvider?.models || []).map((m) => ({ id: m, name: m }));
+  return /* @__PURE__ */ jsxs("div", { className: "rounded-lg border bg-card p-4", children: [
+    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between mb-1", children: [
+      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
+        /* @__PURE__ */ jsx("span", { className: "text-sm font-medium", children: "Kimi CLI" }),
+        config.enabled && /* @__PURE__ */ jsx(StatusDot, { ready })
+      ] }),
+      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
+        saved && /* @__PURE__ */ jsxs("span", { className: "text-xs text-green-500 inline-flex items-center gap-1", children: [
+          /* @__PURE__ */ jsx(CheckIcon, { size: 12 }),
+          " Saved"
+        ] }),
+        /* @__PURE__ */ jsx(ToggleSwitch, { checked: config.enabled, onChange: handleToggle })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx("p", { className: "text-xs text-muted-foreground mb-3", children: "Coding agent by MoonshotAI with multi-provider support." }),
+    config.enabled && /* @__PURE__ */ jsx("div", { className: "border-t border-border pt-3 space-y-3", children: availableProviders.length > 0 ? /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
+        /* @__PURE__ */ jsx("label", { className: "text-sm font-medium", children: "Provider" }),
+        /* @__PURE__ */ jsxs(
+          "select",
+          {
+            value: config.provider || "",
+            onChange: handleProviderChange,
+            className: "w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground",
+            children: [
+              /* @__PURE__ */ jsx("option", { value: "", children: "Select provider..." }),
+              availableProviders.map((p) => /* @__PURE__ */ jsx("option", { value: p.slug, children: p.name }, p.slug))
+            ]
+          }
+        )
+      ] }),
+      config.provider && /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
+        /* @__PURE__ */ jsx("label", { className: "text-sm font-medium", children: "Model" }),
+        providerModels.length > 0 ? /* @__PURE__ */ jsx(
+          "select",
+          {
+            value: config.model || "",
+            onChange: handleModelChange,
+            className: "w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground",
+            children: providerModels.map((m) => /* @__PURE__ */ jsx("option", { value: m.id, children: m.name }, m.id))
+          }
+        ) : /* @__PURE__ */ jsx(
+          "input",
+          {
+            type: "text",
+            value: modelText,
+            onChange: (e) => setModelText(e.target.value),
+            onKeyDown: (e) => e.key === "Enter" && handleModelTextSave(),
+            placeholder: "Model name",
+            className: "w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground"
+          }
+        )
+      ] }),
+      config.provider && !selectedProviderReady && /* @__PURE__ */ jsx(
+        CredentialHint,
+        {
+          ready: false,
+          missingText: `${config.provider} API Key is not set. Configure it on the LLMs page.`
+        }
+      ),
+      config.provider && providerModels.length === 0 && /* @__PURE__ */ jsx("div", { className: "flex justify-end mt-1", children: /* @__PURE__ */ jsx(
+        "button",
+        {
+          onClick: handleModelTextSave,
+          disabled: modelText === (config.model || ""),
+          className: "rounded-md px-3 py-1.5 text-sm font-medium bg-foreground text-background hover:bg-foreground/90 disabled:opacity-50 transition-colors",
+          children: "Save"
+        }
+      ) })
+    ] }) : /* @__PURE__ */ jsx(
+      CredentialHint,
+      {
+        ready: false,
+        missingText: "Configure at least one LLM provider on the LLMs page to use Kimi CLI"
+      }
+    ) })
+  ] });
+}
 function getAgentModels(settings, providerSlug) {
   const provider = settings?.builtinProviders?.[providerSlug];
   if (!provider?.models) return [];
@@ -720,6 +854,10 @@ function isOpenCodeReady(settings) {
   if (!settings.openCode?.enabled || !settings.openCode?.provider) return false;
   return isProviderReady(settings, settings.openCode.provider);
 }
+function isKimiCliReady(settings) {
+  if (!settings.kimiCli?.enabled || !settings.kimiCli?.provider) return false;
+  return isProviderReady(settings, settings.kimiCli.provider);
+}
 function isProviderReady(settings, provider) {
   const statusMap = new Map((settings.credentialStatuses || []).map((s) => [s.key, s.isSet]));
   const builtin = settings.builtinProviders?.[provider];

package/lib/chat/components/settings-coding-agents-page.jsx

@@ -72,6 +72,9 @@ function DefaultAgentSection({ settings, onReload }) {
   if (settings.openCode?.enabled && isOpenCodeReady(settings)) {
     available.push({ value: 'opencode', label: 'OpenCode' });
   }
+  if (settings.kimiCli?.enabled && isKimiCliReady(settings)) {
+    available.push({ value: 'kimi-cli', label: 'Kimi CLI' });
+  }
 
   const handleChange = async (e) => {
     setSaving(true);
@@ -133,6 +136,7 @@ function AgentCards({ settings, onReload }) {
         <GeminiCliCard settings={settings} onReload={onReload} />
         <CodexCliCard settings={settings} onReload={onReload} />
         <OpenCodeCard settings={settings} onReload={onReload} />
+        <KimiCliCard settings={settings} onReload={onReload} />
       </div>
     </div>
   );
@@ -834,6 +838,157 @@ function OpenCodeCard({ settings, onReload }) {
   );
 }
 
+// ─────────────────────────────────────────────────────────────────────────────
+// Kimi CLI card
+// ─────────────────────────────────────────────────────────────────────────────
+
+function KimiCliCard({ settings, onReload }) {
+  const config = settings.kimiCli;
+  const [modelText, setModelText] = useState(config.model || '');
+  const [saved, setSaved] = useState(false);
+
+  const showSaved = () => {
+    setSaved(true);
+    setTimeout(() => setSaved(false), 2000);
+  };
+
+  const handleToggle = async () => {
+    await updateCodingAgentConfig('kimi-cli', { enabled: !config.enabled });
+    await onReload();
+  };
+
+  const handleProviderChange = async (e) => {
+    const newProvider = e.target.value;
+    const cp = settings?.customProviders?.find((p) => p.key === newProvider);
+    const models = getAgentModels(settings, newProvider);
+    const newModel = models.length > 0 ? models[0].id : (cp?.models?.[0] || '');
+    setModelText(newModel);
+    await updateCodingAgentConfig('kimi-cli', { provider: newProvider, model: newModel });
+    await onReload();
+    showSaved();
+  };
+
+  const handleModelChange = async (e) => {
+    await updateCodingAgentConfig('kimi-cli', { model: e.target.value });
+    await onReload();
+    showSaved();
+  };
+
+  const handleModelTextSave = async () => {
+    await updateCodingAgentConfig('kimi-cli', { model: modelText });
+    await onReload();
+    showSaved();
+  };
+
+  const availableProviders = [];
+  if (settings?.builtinProviders && settings?.credentialStatuses) {
+    const statusMap = new Map(settings.credentialStatuses.map((s) => [s.key, s.isSet]));
+    for (const [slug, prov] of Object.entries(settings.builtinProviders)) {
+      const hasKey = prov.credentials.some((c) => statusMap.get(c.key));
+      if (hasKey) {
+        availableProviders.push({ slug, name: prov.name });
+      }
+    }
+  }
+  if (settings?.customProviders) {
+    for (const cp of settings.customProviders) {
+      availableProviders.push({ slug: cp.key, name: cp.name });
+    }
+  }
+
+  const ready = isKimiCliReady(settings);
+  const selectedProviderReady = availableProviders.some(p => p.slug === config.provider);
+
+  const builtinModels = config.provider ? getAgentModels(settings, config.provider) : [];
+  const customProvider = settings?.customProviders?.find((p) => p.key === config.provider);
+  const providerModels = builtinModels.length > 0 ? builtinModels : (customProvider?.models || []).map((m) => ({ id: m, name: m }));
+
+  return (
+    <div className="rounded-lg border bg-card p-4">
+      <div className="flex items-center justify-between mb-1">
+        <div className="flex items-center gap-2">
+          <span className="text-sm font-medium">Kimi CLI</span>
+          {config.enabled && <StatusDot ready={ready} />}
+        </div>
+        <div className="flex items-center gap-3">
+          {saved && <span className="text-xs text-green-500 inline-flex items-center gap-1"><CheckIcon size={12} /> Saved</span>}
+          <ToggleSwitch checked={config.enabled} onChange={handleToggle} />
+        </div>
+      </div>
+      <p className="text-xs text-muted-foreground mb-3">Coding agent by MoonshotAI with multi-provider support.</p>
+
+      {config.enabled && (
+        <div className="border-t border-border pt-3 space-y-3">
+          {availableProviders.length > 0 ? (
+            <>
+              <div className="flex items-center justify-between">
+                <label className="text-sm font-medium">Provider</label>
+                <select
+                  value={config.provider || ''}
+                  onChange={handleProviderChange}
+                  className="w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground"
+                >
+                  <option value="">Select provider...</option>
+                  {availableProviders.map((p) => (
+                    <option key={p.slug} value={p.slug}>{p.name}</option>
+                  ))}
+                </select>
+              </div>
+
+              {config.provider && (
+                <div className="flex items-center justify-between">
+                  <label className="text-sm font-medium">Model</label>
+                  {providerModels.length > 0 ? (
+                    <select
+                      value={config.model || ''}
+                      onChange={handleModelChange}
+                      className="w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground"
+                    >
+                      {providerModels.map((m) => (
+                        <option key={m.id} value={m.id}>{m.name}</option>
+                      ))}
+                    </select>
+                  ) : (
+                    <input
+                      type="text"
+                      value={modelText}
+                      onChange={(e) => setModelText(e.target.value)}
+                      onKeyDown={(e) => e.key === 'Enter' && handleModelTextSave()}
+                      placeholder="Model name"
+                      className="w-48 rounded-md border border-border bg-background px-3 py-1.5 text-sm focus:outline-none focus:ring-1 focus:ring-foreground"
+                    />
+                  )}
+                </div>
+              )}
+
+              {config.provider && !selectedProviderReady && (
+                <CredentialHint
+                  ready={false}
+                  missingText={`${config.provider} API Key is not set. Configure it on the LLMs page.`}
+                />
+              )}
+
+              {config.provider && providerModels.length === 0 && (
+                <div className="flex justify-end mt-1">
+                  <button onClick={handleModelTextSave} disabled={modelText === (config.model || '')}
+                    className="rounded-md px-3 py-1.5 text-sm font-medium bg-foreground text-background hover:bg-foreground/90 disabled:opacity-50 transition-colors">
+                    Save
+                  </button>
+                </div>
+              )}
+            </>
+          ) : (
+            <CredentialHint
+              ready={false}
+              missingText="Configure at least one LLM provider on the LLMs page to use Kimi CLI"
+            />
+          )}
+        </div>
+      )}
+    </div>
+  );
+}
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Shared helpers
 // ─────────────────────────────────────────────────────────────────────────────
@@ -881,6 +1036,11 @@ function isOpenCodeReady(settings) {
   return isProviderReady(settings, settings.openCode.provider);
 }
 
+function isKimiCliReady(settings) {
+  if (!settings.kimiCli?.enabled || !settings.kimiCli?.provider) return false;
+  return isProviderReady(settings, settings.kimiCli.provider);
+}
+
 function isProviderReady(settings, provider) {
   // Check if selected provider has credentials
   const statusMap = new Map((settings.credentialStatuses || []).map(s => [s.key, s.isSet]));

package/lib/chat/components/settings-jobs-page.js

@@ -8,7 +8,8 @@ import {
   getAgentJobSecrets,
   updateAgentJobSecret,
   deleteAgentJobSecretAction,
-  initiateOAuthFlow
+  initiateOAuthFlow,
+  getOAuthSecretCredentials
 } from "../actions.js";
 function buildProviderOptions() {
   const options = [];
@@ -170,6 +171,16 @@ function AddSecretDialog({ open, onAdd, onCancel, onOAuthSuccess, editingSecret
       setCopied(false);
       setRedirectUri(`${window.location.origin}/api/oauth/callback`);
       if (!editingSecret) setTimeout(() => nameRef.current?.focus(), 50);
+      if (editingSecret?.key) {
+        getOAuthSecretCredentials(editingSecret.key).then((creds) => {
+          if (creds && !creds.error) {
+            setClientId(creds.clientId);
+            setClientSecret(creds.clientSecret);
+            const match = PROVIDER_OPTIONS.find((o) => o.tokenUrl === creds.tokenUrl);
+            if (match) setSelectedOption(match.id);
+          }
+        });
+      }
     }
     return () => {
       if (timeoutRef.current) clearTimeout(timeoutRef.current);
@@ -236,7 +247,7 @@ function AddSecretDialog({ open, onAdd, onCancel, onOAuthSuccess, editingSecret
       tokenUrl: opt.tokenUrl,
       scopes,
       secretType: "agent_job_secret",
-      returnPath: "/admin/event-handler/agent-jobs"
+      returnPath: "/admin/event-handler/agent-secrets"
     });
     if (result?.error) {
       setError(result.error);

package/lib/chat/components/settings-jobs-page.jsx

@@ -9,6 +9,7 @@ import {
   updateAgentJobSecret,
   deleteAgentJobSecretAction,
   initiateOAuthFlow,
+  getOAuthSecretCredentials,
 } from '../actions.js';
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -225,6 +226,19 @@ function AddSecretDialog({ open, onAdd, onCancel, onOAuthSuccess, editingSecret
       setCopied(false);
       setRedirectUri(`${window.location.origin}/api/oauth/callback`);
       if (!editingSecret) setTimeout(() => nameRef.current?.focus(), 50);
+
+      // Pre-fill OAuth credentials from stored secret
+      if (editingSecret?.key) {
+        getOAuthSecretCredentials(editingSecret.key).then((creds) => {
+          if (creds && !creds.error) {
+            setClientId(creds.clientId);
+            setClientSecret(creds.clientSecret);
+            // Auto-select provider by matching tokenUrl
+            const match = PROVIDER_OPTIONS.find((o) => o.tokenUrl === creds.tokenUrl);
+            if (match) setSelectedOption(match.id);
+          }
+        });
+      }
     }
     return () => {
       if (timeoutRef.current) clearTimeout(timeoutRef.current);
@@ -306,7 +320,7 @@ function AddSecretDialog({ open, onAdd, onCancel, onOAuthSuccess, editingSecret
       tokenUrl: opt.tokenUrl,
       scopes,
       secretType: 'agent_job_secret',
-      returnPath: '/admin/event-handler/agent-jobs',
+      returnPath: '/admin/event-handler/agent-secrets',
     });
 
     if (result?.error) {

package/lib/chat/components/settings-secrets-layout.js

@@ -30,7 +30,7 @@ const EVENT_HANDLER_TABS = [
   { id: "llms", label: "LLMs", href: "/admin/event-handler/llms" },
   { id: "chat", label: "Chat", href: "/admin/event-handler/chat" },
   { id: "coding-agents", label: "Coding Agents", href: "/admin/event-handler/coding-agents" },
-  { id: "agent-jobs", label: "Agent Jobs", href: "/admin/event-handler/agent-jobs" },
+  { id: "agent-secrets", label: "Agent Secrets", href: "/admin/event-handler/agent-secrets" },
   { id: "webhooks", label: "Webhooks", href: "/admin/event-handler/webhooks" },
   { id: "telegram", label: "Telegram", href: "/admin/event-handler/telegram" },
   { id: "voice", label: "Voice", href: "/admin/event-handler/voice" }

package/lib/chat/components/settings-secrets-layout.jsx

@@ -52,7 +52,7 @@ const EVENT_HANDLER_TABS = [
   { id: 'llms', label: 'LLMs', href: '/admin/event-handler/llms' },
   { id: 'chat', label: 'Chat', href: '/admin/event-handler/chat' },
   { id: 'coding-agents', label: 'Coding Agents', href: '/admin/event-handler/coding-agents' },
-  { id: 'agent-jobs', label: 'Agent Jobs', href: '/admin/event-handler/agent-jobs' },
+  { id: 'agent-secrets', label: 'Agent Secrets', href: '/admin/event-handler/agent-secrets' },
   { id: 'webhooks', label: 'Webhooks', href: '/admin/event-handler/webhooks' },
   { id: 'telegram', label: 'Telegram', href: '/admin/event-handler/telegram' },
   { id: 'voice', label: 'Voice', href: '/admin/event-handler/voice' },

package/lib/chat/components/sidebar-history-item.js

@@ -40,10 +40,10 @@ function SidebarHistoryItem({ chat, isActive, onDelete, onStar, onRename }) {
                 setOpenMobile(false);
               },
               children: [
-                chat.chatMode === "code" ? /* @__PURE__ */ jsxs("span", { className: "relative", children: [
-                  /* @__PURE__ */ jsx(CodeIcon, { size: 14 }),
+                /* @__PURE__ */ jsxs("span", { className: "relative", children: [
+                  chat.chatMode === "code" ? /* @__PURE__ */ jsx(CodeIcon, { size: 14 }) : /* @__PURE__ */ jsx(AgentIcon, { size: 14 }),
                   chat.hasChanges ? /* @__PURE__ */ jsx("span", { className: "absolute -bottom-0.5 -right-0.5 w-2 h-2 rounded-full bg-destructive" }) : null
-                ] }) : /* @__PURE__ */ jsx(AgentIcon, { size: 14 }),
+                ] }),
                 /* @__PURE__ */ jsx("span", { className: "truncate flex-1", children: chat.title })
               ]
             }

package/lib/chat/components/sidebar-history-item.jsx

@@ -40,12 +40,10 @@ export function SidebarHistoryItem({ chat, isActive, onDelete, onStar, onRename
             setOpenMobile(false);
           }}
         >
-          {chat.chatMode === 'code' ? (
-            <span className="relative">
-              <CodeIcon size={14} />
-              {chat.hasChanges ? <span className="absolute -bottom-0.5 -right-0.5 w-2 h-2 rounded-full bg-destructive" /> : null}
-            </span>
-          ) : <AgentIcon size={14} />}
+          <span className="relative">
+            {chat.chatMode === 'code' ? <CodeIcon size={14} /> : <AgentIcon size={14} />}
+            {chat.hasChanges ? <span className="absolute -bottom-0.5 -right-0.5 w-2 h-2 rounded-full bg-destructive" /> : null}
+          </span>
           <span className="truncate flex-1">
             {chat.title}
           </span>

package/lib/chat/components/triggers-page.js

@@ -133,7 +133,7 @@ function TriggersPage() {
       /* @__PURE__ */ jsx("p", { className: "text-sm font-medium mb-1", children: "No triggers configured" }),
       /* @__PURE__ */ jsxs("p", { className: "text-xs text-muted-foreground max-w-sm", children: [
         "Add webhook triggers by editing ",
-        /* @__PURE__ */ jsx("span", { className: "font-mono", children: "config/TRIGGERS.json" }),
+        /* @__PURE__ */ jsx("span", { className: "font-mono", children: "event-handler/TRIGGERS.json" }),
         " in your project."
       ] })
     ] }) : /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-3", children: [

package/lib/chat/components/triggers-page.jsx

@@ -193,7 +193,7 @@ export function TriggersPage() {
           </div>
           <p className="text-sm font-medium mb-1">No triggers configured</p>
           <p className="text-xs text-muted-foreground max-w-sm">
-            Add webhook triggers by editing <span className="font-mono">config/TRIGGERS.json</span> in your project.
+            Add webhook triggers by editing <span className="font-mono">event-handler/TRIGGERS.json</span> in your project.
           </p>
         </div>
       ) : (

package/lib/cluster/actions.js

@@ -3,7 +3,7 @@
 import fs from 'fs';
 import path from 'path';
 import { auth } from '../auth/index.js';
-import { configDir } from '../paths.js';
+import { PROJECT_ROOT } from '../paths.js';
 import {
   createCluster as dbCreateCluster,
   getClusterById,
@@ -25,7 +25,7 @@ import {
 } from '../db/clusters.js';
 
 function readDefault(filename) {
-  try { return fs.readFileSync(path.join(configDir, filename), 'utf8'); }
+  try { return fs.readFileSync(path.join(PROJECT_ROOT, filename), 'utf8'); }
   catch { return ''; }
 }
 
@@ -62,7 +62,7 @@ export async function getCluster(clusterId) {
 
 export async function createCluster(name = 'New Cluster') {
   const user = await requireAuth();
-  const cluster = dbCreateCluster(user.id, { name, systemPrompt: readDefault('cluster/SYSTEM.md') });
+  const cluster = dbCreateCluster(user.id, { name, systemPrompt: readDefault('event-handler/clusters/SYSTEM.md') });
   const { clusterDir } = await import('./execute.js');
   const dir = clusterDir(cluster);
   fs.mkdirSync(`${dir}/shared`, { recursive: true });
@@ -130,7 +130,7 @@ export async function createClusterRoleAction(clusterId, roleName, role = '') {
   const user = await requireAuth();
   const cluster = getClusterById(clusterId);
   if (!cluster || cluster.userId !== user.id) return { success: false };
-  const record = dbCreateClusterRole(clusterId, { roleName, role: role || readDefault('cluster/ROLE.md') });
+  const record = dbCreateClusterRole(clusterId, { roleName, role: role || readDefault('event-handler/clusters/ROLE.md') });
   // Create role directory
   const { roleDir } = await import('./execute.js');
   const dir = roleDir(cluster, record);

package/lib/cluster/execute.js

@@ -1,7 +1,9 @@
 import { randomUUID } from 'crypto';
 import path from 'path';
 import fs from 'fs';
-import { clusterDataDir } from '../paths.js';
+import { PROJECT_ROOT } from '../paths.js';
+
+const clusterDataDir = process.env.CLUSTER_DATA_PATH || path.join(PROJECT_ROOT, 'data/clusters');
 import { getConfig } from '../config.js';
 import { stopContainer as dockerStopContainer, removeContainer, runClusterWorkerContainer, resolveHostPath, listContainers } from '../tools/docker.js';
 import { getRoleWithCluster, getClusterRolesByCluster, roleShortId } from '../db/clusters.js';

package/lib/code/actions.js

@@ -543,13 +543,21 @@ export async function getWorkspaceDiffStats(id, authenticatedUser) {
     const { execSync } = await import('child_process');
     const opts = { cwd: repoPath, encoding: 'utf8', timeout: 5000 };
 
-    const featureBranch = workspace.featureBranch || workspace.branch || 'main';
     const baseBranch = workspace.branch || 'main';
-    let diffRef;
+    let currentBranch;
     try {
-      execSync(`git -c safe.directory='*' rev-parse --verify origin/${featureBranch} 2>/dev/null`, opts);
-      diffRef = `origin/${featureBranch}`;
-    } catch {
+      const detected = execSync(`git -c safe.directory='*' rev-parse --abbrev-ref HEAD`, opts).trim();
+      currentBranch = (detected && detected !== 'HEAD') ? detected : null;
+    } catch { /* leave null */ }
+    let diffRef;
+    if (currentBranch) {
+      try {
+        execSync(`git -c safe.directory='*' rev-parse --verify origin/${currentBranch} 2>/dev/null`, opts);
+        diffRef = `origin/${currentBranch}`;
+      } catch {
+        diffRef = `origin/${baseBranch}`;
+      }
+    } else {
       diffRef = `origin/${baseBranch}`;
     }
 
@@ -584,7 +592,14 @@ export async function getWorkspaceDiffStats(id, authenticatedUser) {
     }
 
     updateHasChanges(id, insertions > 0 || deletions > 0);
-    return { success: true, insertions, deletions };
+
+    // Sync featureBranch in DB if the actual branch differs
+    if (currentBranch && currentBranch !== workspace.featureBranch) {
+      const { updateFeatureBranch } = await import('../db/code-workspaces.js');
+      updateFeatureBranch(id, currentBranch);
+    }
+
+    return { success: true, insertions, deletions, currentBranch };
   } catch (err) {
     console.error(`[getWorkspaceDiffStats] workspace=${id}`, err);
     return { success: false };
@@ -618,13 +633,21 @@ export async function getWorkspaceDiffFull(id, authenticatedUser) {
     const { execSync } = await import('child_process');
     const opts = { cwd: repoPath, encoding: 'utf8', timeout: 10000 };
 
-    const featureBranch = workspace.featureBranch || workspace.branch || 'main';
     const baseBranch = workspace.branch || 'main';
-    let diffRef;
+    let currentBranch;
     try {
-      execSync(`git -c safe.directory='*' rev-parse --verify origin/${featureBranch} 2>/dev/null`, opts);
-      diffRef = `origin/${featureBranch}`;
-    } catch {
+      const detected = execSync(`git -c safe.directory='*' rev-parse --abbrev-ref HEAD`, opts).trim();
+      currentBranch = (detected && detected !== 'HEAD') ? detected : null;
+    } catch { /* leave null */ }
+    let diffRef;
+    if (currentBranch) {
+      try {
+        execSync(`git -c safe.directory='*' rev-parse --verify origin/${currentBranch} 2>/dev/null`, opts);
+        diffRef = `origin/${currentBranch}`;
+      } catch {
+        diffRef = `origin/${baseBranch}`;
+      }
+    } else {
       diffRef = `origin/${baseBranch}`;
     }