@markus-global/cli 0.8.4-rc.0 → 0.8.4-rc.10

package/dist/markus.mjs

@@ -4563,9 +4563,11 @@ import { fileURLToPath } from "node:url";
 function findVersion() {
   const candidates = [
     resolve2(__dirname2, "..", "package.json"),
-    // npm global: dist/ → ../package.json
-    resolve2(__dirname2, "..", "..", "..", "package.json")
+    // npm global: dist/ → ../package.json  (also Electron: dist/ → app.asar root)
+    resolve2(__dirname2, "..", "..", "..", "package.json"),
     // monorepo: packages/shared/dist/ → root
+    resolve2(__dirname2, "package.json")
+    // fallback: same dir as bundle
   ];
   for (const p of candidates) {
     if (existsSync3(p)) {
@@ -4687,6 +4689,10 @@ var init_update_checker = __esm({
 });
 
 // ../shared/dist/limits.js
+function hasCompletionMarker(reply) {
+  const outside = reply.replace(/<think>[\s\S]*?<\/think>/g, "");
+  return outside.includes(COMPLETION_MARKER);
+}
 function withJitter(baseMs, factor = 0.2) {
   const jitter = baseMs * factor * (2 * Math.random() - 1);
   return Math.max(0, Math.round(baseMs + jitter));
@@ -5046,6 +5052,7 @@ __export(dist_exports, {
   getDefaultConfigPath: () => getDefaultConfigPath,
   getMASToolBlockedMessage: () => getMASToolBlockedMessage,
   getTextContent: () => getTextContent,
+  hasCompletionMarker: () => hasCompletionMarker,
   isMASBuild: () => isMASBuild,
   isPlaceholder: () => isPlaceholder,
   isToolDisabledInMAS: () => isToolDisabledInMAS,
@@ -5206,6 +5213,8 @@ function resolveTemplatesDir(sub) {
   if (existsSync5(cwdDir)) return cwdDir;
   const pkgDir = resolve3(__dirname3, "..", "templates", sub);
   if (existsSync5(pkgDir)) return pkgDir;
+  const electronDir = resolve3(__dirname3, "templates", sub);
+  if (existsSync5(electronDir)) return electronDir;
   return envDir ? resolve3(envDir, sub) : cwdDir;
 }
 function allTemplateDirs(sub) {
@@ -5221,6 +5230,8 @@ function allTemplateDirs(sub) {
   if (existsSync5(cwdDir) && !dirs.includes(cwdDir)) dirs.push(cwdDir);
   const pkgDir = resolve3(__dirname3, "..", "templates", sub);
   if (existsSync5(pkgDir) && !dirs.includes(pkgDir)) dirs.push(pkgDir);
+  const electronDir = resolve3(__dirname3, "templates", sub);
+  if (existsSync5(electronDir) && !dirs.includes(electronDir)) dirs.push(electronDir);
   return dirs;
 }
 function resolveWebUiDir() {
@@ -10070,20 +10081,18 @@ echo ${sentinel}_$?_
         this.agentSessions.clear();
       }
       createSession(sessionId, agentId2, cwd) {
-        const shell = process.env["SHELL"] || "/bin/sh";
-        const isBashLike = /\b(bash|zsh)\b/.test(shell);
-        const args = isBashLike ? ["--norc", "--noprofile", "-i"] : [];
+        const isWin = process.platform === "win32";
+        const shell = isWin ? process.env["COMSPEC"] || "cmd.exe" : process.env["SHELL"] || "/bin/sh";
+        const isBashLike = !isWin && /\b(bash|zsh)\b/.test(shell);
+        const args = isWin ? ["/Q"] : isBashLike ? ["--norc", "--noprofile", "-i"] : [];
         const child = spawn(shell, args, {
           cwd: cwd ?? process.cwd(),
           stdio: ["pipe", "pipe", "pipe"],
           env: {
             ...process.env,
-            PS1: "",
-            PS2: "",
-            PROMPT_COMMAND: "",
-            TERM: "dumb",
-            ENV: ""
-          }
+            ...isWin ? {} : { PS1: "", PS2: "", PROMPT_COMMAND: "", TERM: "dumb", ENV: "" }
+          },
+          windowsHide: true
         });
         const session = new ManagedSession(sessionId, agentId2, child);
         this.sessions.set(sessionId, session);
@@ -10109,6 +10118,7 @@ echo ${sentinel}_$?_
 // ../core/dist/tools/shell.js
 import { spawn as spawn2 } from "node:child_process";
 import { resolve as resolve4, normalize, sep } from "node:path";
+import { platform as platform2 } from "node:os";
 function injectGitCommitMeta(command, meta) {
   if (!meta)
     return command;
@@ -10277,13 +10287,16 @@ function createShellTool(security, workspacePath, agentMeta, policy, onCommandAp
           settled = true;
           resolve21(result);
         };
-        const child = spawn2("sh", ["-c", finalCommand], {
+        const isWin = platform2() === "win32";
+        const child = spawn2(isWin ? process.env["COMSPEC"] || "cmd.exe" : "sh", isWin ? ["/d", "/s", "/c", finalCommand] : ["-c", finalCommand], {
           cwd: effectiveCwd ?? void 0,
           stdio: ["ignore", "pipe", "pipe"],
-          detached: true,
-          env: { ...process.env }
+          detached: !isWin,
+          env: { ...process.env },
+          windowsHide: true
         });
-        child.unref();
+        if (!isWin)
+          child.unref();
         let stdout = "";
         let stderr = "";
         let killed = false;
@@ -10291,12 +10304,20 @@ function createShellTool(security, workspacePath, agentMeta, policy, onCommandAp
         const timeout = setTimeout(() => {
           killed = true;
           try {
-            process.kill(-child.pid, "SIGTERM");
+            if (isWin) {
+              child.kill();
+            } else {
+              process.kill(-child.pid, "SIGTERM");
+            }
           } catch {
           }
           setTimeout(() => {
             try {
-              process.kill(-child.pid, "SIGKILL");
+              if (isWin) {
+                child.kill("SIGKILL");
+              } else {
+                process.kill(-child.pid, "SIGKILL");
+              }
             } catch {
             }
             child.stdout?.destroy();
@@ -42223,10 +42244,10 @@ var require_turndown_cjs = __commonJS({
         if (!content) return "";
         content = content.replace(/\r?\n|\r/g, " ");
         var extraSpace = /^`|^ .*?[^ ].* $|`$/.test(content) ? " " : "";
-        var delimiter = "`";
+        var delimiter2 = "`";
         var matches2 = content.match(/`+/gm) || [];
-        while (matches2.indexOf(delimiter) !== -1) delimiter = delimiter + "`";
-        return delimiter + extraSpace + content + extraSpace + delimiter;
+        while (matches2.indexOf(delimiter2) !== -1) delimiter2 = delimiter2 + "`";
+        return delimiter2 + extraSpace + content + extraSpace + delimiter2;
       }
     };
     rules.image = {
@@ -42616,14 +42637,14 @@ var require_turndown_cjs = __commonJS({
         } else if (node.nodeType === 1) {
           replacement = replacementForNode.call(self2, node);
         }
-        return join39(output, replacement);
+        return join40(output, replacement);
       }, "");
     }
     function postProcess(output) {
       var self2 = this;
       this.rules.forEach(function(rule) {
         if (typeof rule.append === "function") {
-          output = join39(output, rule.append(self2.options));
+          output = join40(output, rule.append(self2.options));
         }
       });
       return output.replace(/^[\t\r\n]+/, "").replace(/[\t\r\n\s]+$/, "");
@@ -42635,7 +42656,7 @@ var require_turndown_cjs = __commonJS({
       if (whitespace2.leading || whitespace2.trailing) content = content.trim();
       return whitespace2.leading + rule.replacement(content, node, this.options) + whitespace2.trailing;
     }
-    function join39(output, replacement) {
+    function join40(output, replacement) {
       var s1 = trimTrailingNewlines(output);
       var s2 = trimLeadingNewlines(replacement);
       var nls = Math.max(output.length - s1.length, replacement.length - s2.length);
@@ -43782,6 +43803,7 @@ var init_patch = __esm({
 // ../core/dist/tools/process-manager.js
 import { spawn as spawn3 } from "node:child_process";
 import { resolve as resolve7 } from "node:path";
+import { platform as platform3 } from "node:os";
 function onBackgroundCompletion(cb) {
   completionListeners.push(cb);
   return () => {
@@ -43848,9 +43870,11 @@ function createBackgroundExecTool(workspacePath) {
         return JSON.stringify({ status: "denied", error: "Working directory must be within workspace" });
       }
       const id = `bg_${++sessionCounter}_${Date.now()}`;
-      const child = spawn3("sh", ["-c", command], {
+      const isWin = platform3() === "win32";
+      const child = spawn3(isWin ? process.env["COMSPEC"] || "cmd.exe" : "sh", isWin ? ["/d", "/s", "/c", command] : ["-c", command], {
         cwd: effectiveCwd,
-        stdio: ["ignore", "pipe", "pipe"]
+        stdio: ["ignore", "pipe", "pipe"],
+        windowsHide: true
       });
       const session = {
         id,
@@ -45097,7 +45121,7 @@ function detectAbnormalCompletion(reply, item) {
   if (reply === void 0 || reply === "") {
     return "empty reply from LLM-invoking item";
   }
-  if (!reply.includes(COMPLETION_MARKER)) {
+  if (!hasCompletionMarker(reply)) {
     return "completion marker missing from reply";
   }
   return void 0;
@@ -48015,7 +48039,7 @@ ${notification.stdoutTail}`);
       async ensureCompletionMarker(reply, sessionId) {
         if (!reply || reply === "[cancelled]" || reply === "[preempted]" || reply === "[merged]")
           return reply;
-        if (reply.includes(COMPLETION_MARKER))
+        if (hasCompletionMarker(reply))
           return reply;
         if (!sessionId || !this.memory.getSession(sessionId))
           return reply;
@@ -57963,12 +57987,12 @@ var init_semantic_search = __esm({
 
 // ../core/dist/tools/chrome-dialog-clicker.js
 import { execFile as execFile3, spawn as spawn5 } from "node:child_process";
-import { platform as platform2 } from "node:os";
-import { resolve as resolve9, dirname as dirname5 } from "node:path";
+import { platform as platform4, homedir as homedir6 } from "node:os";
+import { resolve as resolve9, dirname as dirname5, join as join13 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { existsSync as existsSync17 } from "node:fs";
 async function checkAutoClickStatus() {
-  const os = platform2();
+  const os = platform4();
   const base = {
     platform: os,
     supported: os === "darwin" || os === "win32",
@@ -58007,7 +58031,7 @@ async function checkAutoClickStatus() {
   return base;
 }
 async function openAccessibilitySettings() {
-  const os = platform2();
+  const os = platform4();
   if (os === "darwin") {
     const bin = resolve9(SCRIPTS_DIR, "markus-chrome-allow");
     if (!existsSync17(bin))
@@ -58038,7 +58062,7 @@ async function testAutoClick() {
     result.error = "Helper binary not found";
     return result;
   }
-  if (platform2() === "darwin" && !checkResult.accessibilityPermission) {
+  if (platform4() === "darwin" && !checkResult.accessibilityPermission) {
     result.openedAccessibilitySettings = await openAccessibilitySettings();
     result.clickResult = "no_permission";
     return result;
@@ -58064,13 +58088,13 @@ async function testAutoClick() {
   return result;
 }
 async function runMcpTest() {
-  const npxCmd = platform2() === "win32" ? "npx.cmd" : "npx";
+  const npxCmd = platform4() === "win32" ? "npx.cmd" : "npx";
   return new Promise((resolveTest, rejectTest) => {
     const stderrChunks = [];
     const proc = spawn5(npxCmd, ["-y", "chrome-devtools-mcp@latest", "--autoConnect"], {
       stdio: ["pipe", "pipe", "pipe"],
       env: { ...process.env },
-      shell: platform2() === "win32"
+      shell: platform4() === "win32"
     });
     let stdout = "";
     let requestId = 1;
@@ -58169,7 +58193,7 @@ async function runMcpTest() {
   });
 }
 async function clickChromeAllowDialog(timeoutSec = 5) {
-  const os = platform2();
+  const os = platform4();
   if (os === "darwin") {
     const bin = resolve9(SCRIPTS_DIR, "markus-chrome-allow");
     return runHelper(bin, ["--timeout", String(timeoutSec)], timeoutSec);
@@ -58220,7 +58244,14 @@ var init_chrome_dialog_clicker = __esm({
     log30 = createLogger("chrome-dialog-clicker");
     __filename2 = fileURLToPath3(import.meta.url);
     __dirname4 = dirname5(__filename2);
-    SCRIPTS_DIR = resolve9(__dirname4, "../../../../scripts/markus-chrome-allow");
+    SCRIPTS_DIR = [
+      resolve9(__dirname4, "../../../../scripts/markus-chrome-allow"),
+      // monorepo dev
+      resolve9(__dirname4, "scripts", "markus-chrome-allow"),
+      // Electron bundle
+      join13(homedir6(), ".markus", "scripts", "markus-chrome-allow")
+      // user-installed
+    ].find((d) => existsSync17(d)) ?? resolve9(__dirname4, "../../../../scripts/markus-chrome-allow");
   }
 });
 
@@ -59278,9 +59309,9 @@ var init_dist3 = __esm({
 });
 
 // ../core/dist/agent-manager.js
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 import { mkdirSync as mkdirSync12, readFileSync as readFileSync13, existsSync as existsSync18, copyFileSync, rmSync, readdirSync as readdirSync4, writeFileSync as writeFileSync11 } from "node:fs";
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir7 } from "node:os";
 function resolveCurrentTaskId(agentObj, ts, agentId2) {
   const activeTasks = agentObj?.getActiveTasks?.() ?? [];
   if (activeTasks.length === 0)
@@ -59437,7 +59468,7 @@ var init_agent_manager = __esm({
       constructor(options) {
         this.llmRouter = options.llmRouter;
         this.roleLoader = options.roleLoader ?? new RoleLoader();
-        this.dataDir = options.dataDir ?? join13(homedir6(), ".markus", "agents");
+        this.dataDir = options.dataDir ?? join14(homedir7(), ".markus", "agents");
         this.sharedDataDir = options.sharedDataDir;
         this.eventBus = options.eventBus ?? new EventBus();
         this.mcpManager = new MCPClientManager();
@@ -59719,12 +59750,12 @@ Priority: ${delegation.priority}`, envelope.from, { name: envelope.from, role: "
        */
       static BUILDER_ROLES = /* @__PURE__ */ new Set(["agent-father", "team-factory", "skill-architect"]);
       buildPathPolicy(agentId2, workspacePath, roleDir, teamDataDir, builderArtifactsDir) {
-        const agentOwnDir = join13(this.dataDir, agentId2);
+        const agentOwnDir = join14(this.dataDir, agentId2);
         const denyWritePaths = [];
         if (existsSync18(this.dataDir)) {
           for (const entry of readdirSync4(this.dataDir, { withFileTypes: true })) {
             if (entry.isDirectory() && entry.name !== agentId2) {
-              denyWritePaths.push(join13(this.dataDir, entry.name));
+              denyWritePaths.push(join14(this.dataDir, entry.name));
             }
           }
         }
@@ -59765,21 +59796,21 @@ You are ${request.name}.`,
           defaultPolicies: [],
           builtIn: false
         } : this.roleLoader.loadRole(roleName);
-        const agentDataDir = join13(this.dataDir, id);
+        const agentDataDir = join14(this.dataDir, id);
         mkdirSync12(agentDataDir, { recursive: true });
-        const agentRoleDir = join13(agentDataDir, "role");
+        const agentRoleDir = join14(agentDataDir, "role");
         mkdirSync12(agentRoleDir, { recursive: true });
         if (!isCustomRole && !request.skipTemplateCopy) {
           const templateDir = this.roleLoader.resolveTemplateDir(roleName);
           if (templateDir) {
             for (const file of ["ROLE.md", "HEARTBEAT.md", "POLICIES.md", "CONTEXT.md"]) {
-              const src = join13(templateDir, file);
+              const src = join14(templateDir, file);
               if (existsSync18(src))
-                copyFileSync(src, join13(agentRoleDir, file));
+                copyFileSync(src, join14(agentRoleDir, file));
             }
           }
         }
-        const heartbeatPath = join13(agentRoleDir, "HEARTBEAT.md");
+        const heartbeatPath = join14(agentRoleDir, "HEARTBEAT.md");
         if (!existsSync18(heartbeatPath)) {
           writeFileSync11(heartbeatPath, [
             "# Heartbeat Checklist",
@@ -59790,9 +59821,9 @@ You are ${request.name}.`,
             "- [ ] Scan recent channel messages for anything requiring attention"
           ].join("\n"), "utf-8");
         }
-        const sessionsDir = join13(agentDataDir, "sessions");
-        const dailyLogsDir = join13(agentDataDir, "daily-logs");
-        const memoryPath = join13(agentDataDir, "MEMORY.md");
+        const sessionsDir = join14(agentDataDir, "sessions");
+        const dailyLogsDir = join14(agentDataDir, "daily-logs");
+        const memoryPath = join14(agentDataDir, "MEMORY.md");
         mkdirSync12(sessionsDir, { recursive: true });
         mkdirSync12(dailyLogsDir, { recursive: true });
         if (!existsSync18(memoryPath)) {
@@ -59824,10 +59855,10 @@ You are ${request.name}.`,
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           updatedAt: (/* @__PURE__ */ new Date()).toISOString()
         };
-        const workspacePath = request.profile?.workspacePath ?? join13(this.dataDir, id, "workspace");
+        const workspacePath = request.profile?.workspacePath ?? join14(this.dataDir, id, "workspace");
         mkdirSync12(workspacePath, { recursive: true });
-        const teamDataDir = request.teamId && request.agentRole === "manager" ? join13(homedir6(), ".markus", "teams", request.teamId) : void 0;
-        const builderArtifactsDir = join13(homedir6(), ".markus", "builder-artifacts");
+        const teamDataDir = request.teamId && request.agentRole === "manager" ? join14(homedir7(), ".markus", "teams", request.teamId) : void 0;
+        const builderArtifactsDir = join14(homedir7(), ".markus", "builder-artifacts");
         const pathPolicy = this.buildPathPolicy(id, workspacePath, agentRoleDir, teamDataDir, builderArtifactsDir);
         const basePolicy = request.securityPolicy ?? this.globalSecurityPolicy;
         const security = new SecurityGuard({
@@ -60132,13 +60163,10 @@ You are ${request.name}.`,
                 throw new Error(`Task not found: ${taskId2}`);
               const reviewerId = task.reviewerId;
               const _validTypes = /* @__PURE__ */ new Set(["file", "directory"]);
-              const deliverables = [{
-                type: "branch",
-                reference: `task/${taskId2}`,
-                summary: `${summary}${knownIssues ? `
+              const completionSummary = `${summary}${knownIssues ? `
 
-Known issues: ${knownIssues}` : ""}`
-              }];
+Known issues: ${knownIssues}` : ""}`;
+              const deliverables = [];
               if (Array.isArray(inputDeliverables)) {
                 for (const d of inputDeliverables) {
                   if (d?.reference) {
@@ -60150,7 +60178,7 @@ Known issues: ${knownIssues}` : ""}`
                   }
                 }
               }
-              return ts.submitForReview(taskId2, deliverables, reviewerId);
+              return ts.submitForReview(taskId2, deliverables, reviewerId, completionSummary);
             },
             proposeRequirement: this.requirementService ? async (params) => {
               return this.requirementService.proposeRequirement({
@@ -60447,7 +60475,7 @@ Known issues: ${knownIssues}` : ""}`
         agent.setBrowserCloseTabsHelper((sessionId) => this.browserSessionManager.consumeCloseTabsReminder(id, sessionId));
         this.forwardAgentEvents(agent);
         if (config.teamId) {
-          agent.setTeamDataDir(join13(homedir6(), ".markus", "teams", config.teamId));
+          agent.setTeamDataDir(join14(homedir7(), ".markus", "teams", config.teamId));
         }
         this.agents.set(id, agent);
         this.delegationManager.registerAgentCard({
@@ -60468,11 +60496,11 @@ Known issues: ${knownIssues}` : ""}`
        */
       async restoreAgent(row) {
         const id = row.id;
-        const agentDataDir = join13(this.dataDir, id);
+        const agentDataDir = join14(this.dataDir, id);
         mkdirSync12(agentDataDir, { recursive: true });
-        const agentRoleDir = join13(agentDataDir, "role");
+        const agentRoleDir = join14(agentDataDir, "role");
         let role;
-        if (existsSync18(join13(agentRoleDir, "ROLE.md"))) {
+        if (existsSync18(join14(agentRoleDir, "ROLE.md"))) {
           role = this.roleLoader.loadRole(agentRoleDir);
         } else if (row.roleId === "custom") {
           role = {
@@ -60516,9 +60544,9 @@ You are ${row.name}.`,
           if (templateDir) {
             mkdirSync12(agentRoleDir, { recursive: true });
             for (const file of ["ROLE.md", "HEARTBEAT.md", "POLICIES.md", "CONTEXT.md"]) {
-              const src = join13(templateDir, file);
+              const src = join14(templateDir, file);
               if (existsSync18(src))
-                copyFileSync(src, join13(agentRoleDir, file));
+                copyFileSync(src, join14(agentRoleDir, file));
             }
           }
         }
@@ -60547,10 +60575,10 @@ You are ${row.name}.`,
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           updatedAt: (/* @__PURE__ */ new Date()).toISOString()
         };
-        const workspacePath = config.profile?.workspacePath ?? join13(this.dataDir, id, "workspace");
+        const workspacePath = config.profile?.workspacePath ?? join14(this.dataDir, id, "workspace");
         mkdirSync12(workspacePath, { recursive: true });
-        const teamDataDir = config.teamId && config.agentRole === "manager" ? join13(homedir6(), ".markus", "teams", config.teamId) : void 0;
-        const builderArtifactsDir = join13(homedir6(), ".markus", "builder-artifacts");
+        const teamDataDir = config.teamId && config.agentRole === "manager" ? join14(homedir7(), ".markus", "teams", config.teamId) : void 0;
+        const builderArtifactsDir = join14(homedir7(), ".markus", "builder-artifacts");
         const pathPolicy = this.buildPathPolicy(id, workspacePath, agentRoleDir, teamDataDir, builderArtifactsDir);
         const basePolicy = this.globalSecurityPolicy;
         const security = new SecurityGuard({
@@ -60844,13 +60872,10 @@ You are ${row.name}.`,
                 throw new Error(`Task not found: ${taskId2}`);
               const reviewerId = task.reviewerId;
               const _validTypes = /* @__PURE__ */ new Set(["file", "directory"]);
-              const deliverables = [{
-                type: "branch",
-                reference: `task/${taskId2}`,
-                summary: `${summary}${knownIssues ? `
+              const completionSummary = `${summary}${knownIssues ? `
 
-Known issues: ${knownIssues}` : ""}`
-              }];
+Known issues: ${knownIssues}` : ""}`;
+              const deliverables = [];
               if (Array.isArray(inputDeliverables)) {
                 for (const d of inputDeliverables) {
                   if (d?.reference) {
@@ -60862,7 +60887,7 @@ Known issues: ${knownIssues}` : ""}`
                   }
                 }
               }
-              return ts.submitForReview(taskId2, deliverables, reviewerId);
+              return ts.submitForReview(taskId2, deliverables, reviewerId, completionSummary);
             },
             proposeRequirement: this.requirementService ? async (params) => {
               return this.requirementService.proposeRequirement({
@@ -61130,7 +61155,7 @@ Known issues: ${knownIssues}` : ""}`
         agent.setBrowserCloseTabsHelper((sessionId) => this.browserSessionManager.consumeCloseTabsReminder(id, sessionId));
         this.forwardAgentEvents(agent);
         if (config.teamId) {
-          agent.setTeamDataDir(join13(homedir6(), ".markus", "teams", config.teamId));
+          agent.setTeamDataDir(join14(homedir7(), ".markus", "teams", config.teamId));
         }
         this.agents.set(id, agent);
         this.delegationManager.registerAgentCard({
@@ -61212,7 +61237,7 @@ Known issues: ${knownIssues}` : ""}`
           this.eventBus.emit("agent:removed", { agentId: agentId2 });
         }
         if (opts?.purgeFiles) {
-          const agentDir = join13(this.dataDir, agentId2);
+          const agentDir = join14(this.dataDir, agentId2);
           if (existsSync18(agentDir)) {
             try {
               rmSync(agentDir, { recursive: true, force: true });
@@ -61235,7 +61260,7 @@ Known issues: ${knownIssues}` : ""}`
             continue;
           if (knownAgentIds.has(entry.name))
             continue;
-          const dirPath = join13(this.dataDir, entry.name);
+          const dirPath = join14(this.dataDir, entry.name);
           try {
             rmSync(dirPath, { recursive: true, force: true });
             removed.push(entry.name);
@@ -61566,8 +61591,8 @@ Known issues: ${knownIssues}` : ""}`
       checkRoleUpdate(agentId2) {
         const agent = this.getAgent(agentId2);
         const { roleId } = agent.config;
-        const agentRoleDir = join13(this.dataDir, agentId2, "role");
-        const originPath = join13(agentRoleDir, ".role-origin.json");
+        const agentRoleDir = join14(this.dataDir, agentId2, "role");
+        const originPath = join14(agentRoleDir, ".role-origin.json");
         if (existsSync18(originPath)) {
           try {
             const origin = JSON.parse(readFileSync13(originPath, "utf-8"));
@@ -61582,8 +61607,8 @@ Known issues: ${knownIssues}` : ""}`
         if (!templateDir) {
           return { agentId: agentId2, roleId, templateId: roleId, hasTemplate: false, isUpToDate: true, files: [] };
         }
-        const agentRolePath = join13(agentRoleDir, "ROLE.md");
-        const templateRolePath = join13(templateDir, "ROLE.md");
+        const agentRolePath = join14(agentRoleDir, "ROLE.md");
+        const templateRolePath = join14(templateDir, "ROLE.md");
         if (existsSync18(agentRolePath) && existsSync18(templateRolePath)) {
           const headingOf = (text) => text.match(/^#\s+(.+)/m)?.[1]?.trim();
           const agentTitle = headingOf(readFileSync13(agentRolePath, "utf-8"));
@@ -61595,8 +61620,8 @@ Known issues: ${knownIssues}` : ""}`
         const files = [];
         let allIdentical = true;
         for (const file of _AgentManager.ROLE_FILES) {
-          const tPath = join13(templateDir, file);
-          const aPath = join13(agentRoleDir, file);
+          const tPath = join14(templateDir, file);
+          const aPath = join14(agentRoleDir, file);
           const tExists = existsSync18(tPath);
           const aExists = existsSync18(aPath);
           if (!tExists && !aExists)
@@ -61623,9 +61648,9 @@ Known issues: ${knownIssues}` : ""}`
         const agent = this.getAgent(agentId2);
         const { roleId } = agent.config;
         const templateDir = this.roleLoader.resolveTemplateDir(roleId);
-        const agentRoleDir = join13(this.dataDir, agentId2, "role");
-        const aPath = join13(agentRoleDir, fileName);
-        const tPath = templateDir ? join13(templateDir, fileName) : null;
+        const agentRoleDir = join14(this.dataDir, agentId2, "role");
+        const aPath = join14(agentRoleDir, fileName);
+        const tPath = templateDir ? join14(templateDir, fileName) : null;
         return {
           file: fileName,
           agentContent: existsSync18(aPath) ? readFileSync13(aPath, "utf-8") : null,
@@ -61639,14 +61664,14 @@ Known issues: ${knownIssues}` : ""}`
         if (!templateDir) {
           return { agentId: agentId2, success: false, error: `No template found for roleId: ${roleId}`, synced: [] };
         }
-        const agentRoleDir = join13(this.dataDir, agentId2, "role");
+        const agentRoleDir = join14(this.dataDir, agentId2, "role");
         mkdirSync12(agentRoleDir, { recursive: true });
         const filesToSync = fileNames ?? [..._AgentManager.ROLE_FILES];
         const synced = [];
         for (const file of filesToSync) {
-          const src = join13(templateDir, file);
+          const src = join14(templateDir, file);
           if (existsSync18(src)) {
-            copyFileSync(src, join13(agentRoleDir, file));
+            copyFileSync(src, join14(agentRoleDir, file));
             synced.push(file);
           }
         }
@@ -63074,11 +63099,11 @@ var init_fireworks = __esm({
 // ../core/dist/llm/proxy-fetch.js
 import { readFileSync as readFileSync14, existsSync as existsSync19 } from "node:fs";
 import { execSync as execSync2 } from "node:child_process";
-import { join as join14 } from "node:path";
-import { homedir as homedir7, platform as platform3 } from "node:os";
+import { join as join15 } from "node:path";
+import { homedir as homedir8, platform as platform5 } from "node:os";
 function readNetworkConfig() {
   try {
-    const configPath = join14(homedir7(), ".markus", "markus.json");
+    const configPath = join15(homedir8(), ".markus", "markus.json");
     if (!existsSync19(configPath))
       return {};
     const raw = JSON.parse(readFileSync14(configPath, "utf-8"));
@@ -63091,7 +63116,7 @@ function readNetworkConfig() {
   }
 }
 function readSystemProxy() {
-  const os = platform3();
+  const os = platform5();
   try {
     if (os === "darwin") {
       return readMacOSProxy();
@@ -64079,8 +64104,8 @@ var init_ollama = __esm({
 
 // ../core/dist/llm/auth-profiles.js
 import { readFileSync as readFileSync15, writeFileSync as writeFileSync12, mkdirSync as mkdirSync13, existsSync as existsSync20, unlinkSync as unlinkSync3 } from "node:fs";
-import { join as join15 } from "node:path";
-import { homedir as homedir8 } from "node:os";
+import { join as join16 } from "node:path";
+import { homedir as homedir9 } from "node:os";
 var log39, AuthProfileStore;
 var init_auth_profiles = __esm({
   "../core/dist/llm/auth-profiles.js"() {
@@ -64091,9 +64116,9 @@ var init_auth_profiles = __esm({
       filePath;
       lockPath;
       constructor(stateDir) {
-        const dir = stateDir ?? join15(homedir8(), ".markus");
-        this.filePath = join15(dir, "auth-profiles.json");
-        this.lockPath = join15(dir, ".auth-profiles.lock");
+        const dir = stateDir ?? join16(homedir9(), ".markus");
+        this.filePath = join16(dir, "auth-profiles.json");
+        this.lockPath = join16(dir, ".auth-profiles.lock");
         mkdirSync13(dir, { recursive: true });
       }
       read() {
@@ -66048,8 +66073,8 @@ var init_router = __esm({
 
 // ../core/dist/llm/llm-logger.js
 import { mkdirSync as mkdirSync14, appendFileSync as appendFileSync2 } from "node:fs";
-import { join as join16 } from "node:path";
-import { homedir as homedir9 } from "node:os";
+import { join as join17 } from "node:path";
+import { homedir as homedir10 } from "node:os";
 var log42, LLMLogger;
 var init_llm_logger = __esm({
   "../core/dist/llm/llm-logger.js"() {
@@ -66060,7 +66085,7 @@ var init_llm_logger = __esm({
       logDir;
       enabled;
       constructor(logDir) {
-        this.logDir = logDir ?? join16(homedir9(), ".markus", "llm-logs");
+        this.logDir = logDir ?? join17(homedir10(), ".markus", "llm-logs");
         this.enabled = process.env.MARKUS_LLM_LOG !== "false";
         if (this.enabled) {
           try {
@@ -66076,7 +66101,7 @@ var init_llm_logger = __esm({
           return;
         try {
           const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-          const filePath = join16(this.logDir, `${date}.jsonl`);
+          const filePath = join17(this.logDir, `${date}.jsonl`);
           const line = JSON.stringify(entry) + "\n";
           appendFileSync2(filePath, line, "utf-8");
         } catch (err) {
@@ -66089,8 +66114,8 @@ var init_llm_logger = __esm({
 
 // ../core/dist/llm/model-catalog.js
 import { readFileSync as readFileSync16, writeFileSync as writeFileSync13, existsSync as existsSync21, mkdirSync as mkdirSync15, statSync as statSync4 } from "node:fs";
-import { join as join17, dirname as dirname6 } from "node:path";
-import { homedir as homedir10 } from "node:os";
+import { join as join18, dirname as dirname6 } from "node:path";
+import { homedir as homedir11 } from "node:os";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 var __filename3, __dirname5, DATA_DIR, log43, LITELLM_JSON_URL, LITELLM_MIRROR_URLS, CACHE_MAX_AGE_MS, RETRY_BACKOFF_MS, CACHE_FILENAME, PROVIDER_MAP, PROVIDER_ALIASES, KNOWN_LITELLM_PREFIXES, ModelCatalogService;
 var init_model_catalog2 = __esm({
@@ -66099,7 +66124,12 @@ var init_model_catalog2 = __esm({
     init_dist();
     __filename3 = fileURLToPath4(import.meta.url);
     __dirname5 = dirname6(__filename3);
-    DATA_DIR = join17(__dirname5, "..", "..", "data");
+    DATA_DIR = [
+      join18(__dirname5, "..", "..", "data"),
+      // dev: packages/core/src/../../data
+      join18(__dirname5, "data")
+      // Electron bundle: dist/data
+    ].find((d) => existsSync21(d)) ?? join18(__dirname5, "..", "..", "data");
     log43 = createLogger("model-catalog");
     LITELLM_JSON_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json";
     LITELLM_MIRROR_URLS = [
@@ -66162,7 +66192,7 @@ var init_model_catalog2 = __esm({
       consecutiveFailures = 0;
       lastFailureAt = 0;
       constructor(options) {
-        this.markusDir = join17(homedir10(), ".markus");
+        this.markusDir = join18(homedir11(), ".markus");
         this.mirrorUrl = options?.mirrorUrl;
       }
       async initialize() {
@@ -66266,7 +66296,7 @@ var init_model_catalog2 = __esm({
       }
       loadBaseline() {
         try {
-          const baselinePath = join17(DATA_DIR, "model-catalog-baseline.json");
+          const baselinePath = join18(DATA_DIR, "model-catalog-baseline.json");
           const data = readFileSync16(baselinePath, "utf-8");
           const rawData = JSON.parse(data);
           this.parseAndLoad(rawData, "baseline");
@@ -66277,7 +66307,7 @@ var init_model_catalog2 = __esm({
       }
       loadSupplements() {
         try {
-          const supplementsPath = join17(DATA_DIR, "model-catalog-supplements.json");
+          const supplementsPath = join18(DATA_DIR, "model-catalog-supplements.json");
           const data = readFileSync16(supplementsPath, "utf-8");
           const rawData = JSON.parse(data);
           for (const [key2, entry] of Object.entries(rawData)) {
@@ -66374,7 +66404,7 @@ var init_model_catalog2 = __esm({
         };
       }
       getCachePath() {
-        return join17(this.markusDir, CACHE_FILENAME);
+        return join18(this.markusDir, CACHE_FILENAME);
       }
       isCacheValid(cachePath) {
         try {
@@ -66897,7 +66927,7 @@ var init_openclaw_config_parser = __esm({
 
 // ../core/dist/enhanced-role-loader.js
 import { readFileSync as readFileSync17, existsSync as existsSync22, readdirSync as readdirSync5 } from "node:fs";
-import { join as join18, resolve as resolve10 } from "node:path";
+import { join as join19, resolve as resolve10 } from "node:path";
 var EnhancedRoleLoader;
 var init_enhanced_role_loader = __esm({
   "../core/dist/enhanced-role-loader.js"() {
@@ -66929,17 +66959,17 @@ var init_enhanced_role_loader = __esm({
             continue;
           for (const entry of readdirSync5(dir, { withFileTypes: true })) {
             if (entry.isDirectory()) {
-              const rolePath = join18(dir, entry.name);
-              if (existsSync22(join18(rolePath, "ROLE.md"))) {
+              const rolePath = join19(dir, entry.name);
+              if (existsSync22(join19(rolePath, "ROLE.md"))) {
                 roles.push({ name: entry.name, format: "markus" });
-              } else if (existsSync22(join18(rolePath, "openclaw.md")) || existsSync22(join18(rolePath, "config.md"))) {
+              } else if (existsSync22(join19(rolePath, "openclaw.md")) || existsSync22(join19(rolePath, "config.md"))) {
                 roles.push({ name: entry.name, format: "openclaw" });
               }
             }
           }
           for (const entry of readdirSync5(dir, { withFileTypes: true })) {
             if (entry.isFile() && entry.name.endsWith(".md")) {
-              const filePath = join18(dir, entry.name);
+              const filePath = join19(dir, entry.name);
               const content = readFileSync17(filePath, "utf-8");
               if (this.openclawParser.isOpenClawFormat(content)) {
                 const name = entry.name.replace(/\.md$/, "");
@@ -67021,20 +67051,20 @@ var init_enhanced_role_loader = __esm({
       }
       detectFormat(nameOrPath) {
         if (existsSync22(nameOrPath)) {
-          if (existsSync22(join18(nameOrPath, "ROLE.md"))) {
+          if (existsSync22(join19(nameOrPath, "ROLE.md"))) {
             return "markus";
-          } else if (existsSync22(join18(nameOrPath, "openclaw.md")) || existsSync22(join18(nameOrPath, "config.md"))) {
+          } else if (existsSync22(join19(nameOrPath, "openclaw.md")) || existsSync22(join19(nameOrPath, "config.md"))) {
             return "openclaw";
           }
         }
         for (const dir of this.templateDirs) {
-          const candidate = join18(dir, nameOrPath);
-          if (existsSync22(join18(candidate, "ROLE.md"))) {
+          const candidate = join19(dir, nameOrPath);
+          if (existsSync22(join19(candidate, "ROLE.md"))) {
             return "markus";
-          } else if (existsSync22(join18(candidate, "openclaw.md")) || existsSync22(join18(candidate, "config.md"))) {
+          } else if (existsSync22(join19(candidate, "openclaw.md")) || existsSync22(join19(candidate, "config.md"))) {
             return "openclaw";
           }
-          const mdFile = join18(dir, `${nameOrPath}.md`);
+          const mdFile = join19(dir, `${nameOrPath}.md`);
           if (existsSync22(mdFile)) {
             const content = readFileSync17(mdFile, "utf-8");
             if (this.openclawParser.isOpenClawFormat(content)) {
@@ -67052,11 +67082,11 @@ var init_enhanced_role_loader = __esm({
           content = readFileSync17(nameOrPath, "utf-8");
         } else {
           for (const dir of this.templateDirs) {
-            const candidateDir = join18(dir, nameOrPath);
-            const candidateFile = join18(dir, `${nameOrPath}.md`);
+            const candidateDir = join19(dir, nameOrPath);
+            const candidateFile = join19(dir, `${nameOrPath}.md`);
             if (existsSync22(candidateDir)) {
-              const openclawFile = join18(candidateDir, "openclaw.md");
-              const configFile = join18(candidateDir, "config.md");
+              const openclawFile = join19(candidateDir, "openclaw.md");
+              const configFile = join19(candidateDir, "config.md");
               if (existsSync22(openclawFile)) {
                 sourcePath = openclawFile;
                 content = readFileSync17(openclawFile, "utf-8");
@@ -67128,12 +67158,12 @@ ${sharedContent}` : content;
         };
       }
       findRolePath(nameOrPath) {
-        if (existsSync22(join18(nameOrPath, "ROLE.md"))) {
+        if (existsSync22(join19(nameOrPath, "ROLE.md"))) {
           return nameOrPath;
         }
         for (const dir of this.templateDirs) {
-          const candidate = join18(dir, nameOrPath);
-          if (existsSync22(join18(candidate, "ROLE.md"))) {
+          const candidate = join19(dir, nameOrPath);
+          if (existsSync22(join19(candidate, "ROLE.md"))) {
             return candidate;
           }
         }
@@ -67141,12 +67171,12 @@ ${sharedContent}` : content;
       }
       resolveRoleFiles(nameOrPath) {
         let roleDir;
-        if (existsSync22(join18(nameOrPath, "ROLE.md"))) {
+        if (existsSync22(join19(nameOrPath, "ROLE.md"))) {
           roleDir = nameOrPath;
         } else {
           for (const dir of this.templateDirs) {
-            const candidate = join18(dir, nameOrPath);
-            if (existsSync22(join18(candidate, "ROLE.md"))) {
+            const candidate = join19(dir, nameOrPath);
+            if (existsSync22(join19(candidate, "ROLE.md"))) {
               roleDir = candidate;
               break;
             }
@@ -67156,11 +67186,11 @@ ${sharedContent}` : content;
           throw new Error(`Role not found: ${nameOrPath}`);
         }
         const read = (file) => {
-          const p = join18(roleDir, file);
+          const p = join19(roleDir, file);
           return existsSync22(p) ? readFileSync17(p, "utf-8") : void 0;
         };
         return {
-          role: readFileSync17(join18(roleDir, "ROLE.md"), "utf-8"),
+          role: readFileSync17(join19(roleDir, "ROLE.md"), "utf-8"),
           heartbeat: read("HEARTBEAT.md"),
           policies: read("POLICIES.md"),
           context: read("CONTEXT.md")
@@ -67168,7 +67198,7 @@ ${sharedContent}` : content;
       }
       loadSharedInstructions() {
         for (const dir of this.templateDirs) {
-          const p = join18(dir, "SHARED.md");
+          const p = join19(dir, "SHARED.md");
           if (existsSync22(p))
             return readFileSync17(p, "utf-8");
         }
@@ -67287,7 +67317,7 @@ var init_external_gateway = __esm({
         return rows.length;
       }
       async register(request) {
-        const { externalAgentId, agentName, orgId: orgId2, capabilities = [], platform: platform7, platformConfig, agentCardUrl, openClawConfig } = request;
+        const { externalAgentId, agentName, orgId: orgId2, capabilities = [], platform: platform9, platformConfig, agentCardUrl, openClawConfig } = request;
         if (!externalAgentId || !agentName || !orgId2) {
           throw new GatewayError("Missing required fields: externalAgentId, agentName, orgId", 400);
         }
@@ -67314,7 +67344,7 @@ var init_external_gateway = __esm({
           agentName,
           orgId: orgId2,
           capabilities,
-          platform: platform7 ?? (openClawConfig ? "openclaw" : void 0),
+          platform: platform9 ?? (openClawConfig ? "openclaw" : void 0),
           platformConfig: platformConfig ?? openClawConfig,
           agentCardUrl,
           openClawConfig,
@@ -68267,7 +68297,7 @@ var init_registry = __esm({
 
 // ../core/dist/skills/loader.js
 import { readFileSync as readFileSync18, readdirSync as readdirSync6, existsSync as existsSync23 } from "node:fs";
-import { join as join19, resolve as resolve11 } from "node:path";
+import { join as join20, resolve as resolve11 } from "node:path";
 function resolveMcpServerPaths(servers, skillDir) {
   if (!servers)
     return void 0;
@@ -68282,7 +68312,7 @@ function resolveMcpServerPaths(servers, skillDir) {
   return resolved;
 }
 function readSkillInstructions(skillDir) {
-  const skillMdPath = join19(skillDir, "SKILL.md");
+  const skillMdPath = join20(skillDir, "SKILL.md");
   if (!existsSync23(skillMdPath))
     return void 0;
   try {
@@ -68319,11 +68349,11 @@ var init_loader = __esm({
             continue;
           }
           const entries2 = readdirSync6(dir, { withFileTypes: true });
-          const fsHelper = { existsSync: existsSync23, readFileSync: (p, _enc) => readFileSync18(p, "utf-8"), join: join19 };
+          const fsHelper = { existsSync: existsSync23, readFileSync: (p, _enc) => readFileSync18(p, "utf-8"), join: join20 };
           for (const entry of entries2) {
             if (!entry.isDirectory())
               continue;
-            const skillDir = join19(dir, entry.name);
+            const skillDir = join20(dir, entry.name);
             const pkg_ = readManifest(skillDir, "skill", fsHelper);
             if (!pkg_ || pkg_.type !== "skill")
               continue;
@@ -68349,7 +68379,7 @@ var init_loader = __esm({
               if (instructions)
                 manifest.instructions = instructions;
               let readme;
-              const readmePath = join19(skillDir, "README.md");
+              const readmePath = join20(skillDir, "README.md");
               if (existsSync23(readmePath)) {
                 readme = readFileSync18(readmePath, "utf-8");
               }
@@ -68419,8 +68449,8 @@ var init_loader = __esm({
 });
 
 // ../core/dist/skills/index.js
-import { homedir as homedir11 } from "node:os";
-import { join as join20 } from "node:path";
+import { homedir as homedir12 } from "node:os";
+import { join as join21 } from "node:path";
 import { existsSync as existsSync24, readFileSync as readFileSync19, readdirSync as readdirSync7, statSync as statSync5 } from "node:fs";
 function parseSkillMd(content, dirName) {
   const fmMatch = content.match(/^---\s*\n([\s\S]*?)\n---/);
@@ -68462,14 +68492,14 @@ function discoverSkillsInDir(dir) {
     return [];
   }
   for (const name of names) {
-    const skillDir = join20(dir, name);
+    const skillDir = join21(dir, name);
     try {
       if (!statSync5(skillDir).isDirectory())
         continue;
     } catch {
       continue;
     }
-    const fsHelper = { existsSync: existsSync24, readFileSync: (p, _enc) => readFileSync19(p, "utf-8"), join: join20 };
+    const fsHelper = { existsSync: existsSync24, readFileSync: (p, _enc) => readFileSync19(p, "utf-8"), join: join21 };
     const pkg = readManifest(skillDir, "skill", fsHelper);
     if (pkg && pkg.type === "skill") {
       const instructions = readSkillInstructions(skillDir);
@@ -68490,7 +68520,7 @@ function discoverSkillsInDir(dir) {
       results.push({ manifest, path: skillDir, source: dir });
       continue;
     }
-    const skillMdPath = join20(skillDir, "SKILL.md");
+    const skillMdPath = join21(skillDir, "SKILL.md");
     if (existsSync24(skillMdPath)) {
       try {
         const content = readFileSync19(skillMdPath, "utf-8");
@@ -68540,9 +68570,9 @@ var init_skills = __esm({
     init_loader();
     log50 = createLogger("skill-registry");
     WELL_KNOWN_SKILL_DIRS = [
-      join20(homedir11(), ".markus", "skills"),
-      join20(homedir11(), ".claude", "skills"),
-      join20(homedir11(), ".openclaw", "skills")
+      join21(homedir12(), ".markus", "skills"),
+      join21(homedir12(), ".claude", "skills"),
+      join21(homedir12(), ".openclaw", "skills")
     ];
   }
 });
@@ -69568,16 +69598,16 @@ var init_composition = __esm({
 
 // ../core/dist/workflow/team-template.js
 import { readdirSync as readdirSync8, readFileSync as readFileSync20, existsSync as existsSync25 } from "node:fs";
-import { join as join21, resolve as resolve12, dirname as dirname7 } from "node:path";
+import { join as join22, resolve as resolve12, dirname as dirname7 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function loadTeamTemplateFromDir(dirPath) {
-  const fsHelper = { existsSync: existsSync25, readFileSync: (p, _enc) => readFileSync20(p, "utf-8"), join: join21 };
+  const fsHelper = { existsSync: existsSync25, readFileSync: (p, _enc) => readFileSync20(p, "utf-8"), join: join22 };
   const manifest = readManifest(dirPath, "team", fsHelper);
   if (!manifest || manifest.type !== "team")
     return null;
   try {
-    const annPath = join21(dirPath, "ANNOUNCEMENT.md");
-    const normsPath = join21(dirPath, "NORMS.md");
+    const annPath = join22(dirPath, "ANNOUNCEMENT.md");
+    const normsPath = join22(dirPath, "NORMS.md");
     return {
       id: manifest.name ?? dirPath.split("/").pop() ?? generateId("tpl"),
       name: manifest.displayName ?? manifest.name ?? "Unnamed Team",
@@ -69636,7 +69666,7 @@ function createDefaultTeamTemplates() {
   for (const entry of entries2) {
     if (!entry.isDirectory())
       continue;
-    const tpl = loadTeamTemplateFromDir(join21(templatesDir, entry.name));
+    const tpl = loadTeamTemplateFromDir(join22(templatesDir, entry.name));
     if (tpl) {
       registry.register(tpl);
     }
@@ -70357,8 +70387,8 @@ var init_dist4 = __esm({
 
 // ../org-manager/dist/org-service.js
 import { mkdirSync as mkdirSync16, writeFileSync as writeFileSync14, existsSync as existsSync26, rmSync as rmSync2 } from "node:fs";
-import { join as join22 } from "node:path";
-import { homedir as homedir12 } from "node:os";
+import { join as join23 } from "node:path";
+import { homedir as homedir13 } from "node:os";
 var log56, OrganizationService;
 var init_org_service = __esm({
   "../org-manager/dist/org-service.js"() {
@@ -70538,18 +70568,18 @@ var init_org_service = __esm({
         return [...this.orgs.values()];
       }
       getTeamDataDir(teamId) {
-        return join22(homedir12(), ".markus", "teams", teamId);
+        return join23(homedir13(), ".markus", "teams", teamId);
       }
       ensureTeamDataDir(teamId, announcements, norms) {
         const dir = this.getTeamDataDir(teamId);
         mkdirSync16(dir, { recursive: true });
-        const annPath = join22(dir, "ANNOUNCEMENT.md");
+        const annPath = join23(dir, "ANNOUNCEMENT.md");
         if (announcements) {
           writeFileSync14(annPath, announcements, "utf-8");
         } else if (!existsSync26(annPath)) {
           writeFileSync14(annPath, "", "utf-8");
         }
-        const normsPath = join22(dir, "NORMS.md");
+        const normsPath = join23(dir, "NORMS.md");
         if (norms) {
           writeFileSync14(normsPath, norms, "utf-8");
         } else if (!existsSync26(normsPath)) {
@@ -70651,7 +70681,7 @@ var init_org_service = __esm({
         }
         this.teams.delete(teamId);
         if (opts?.purgeFiles) {
-          const teamDir = join22(homedir12(), ".markus", "teams", teamId);
+          const teamDir = join23(homedir13(), ".markus", "teams", teamId);
           if (existsSync26(teamDir)) {
             try {
               rmSync2(teamDir, { recursive: true, force: true });
@@ -70936,7 +70966,7 @@ var init_org_service = __esm({
           throw new Error("The Secretary agent is a protected system agent and cannot be deleted.");
         }
         if (this.deliverableService) {
-          const agentDir = join22(this.agentManager.getDataDir(), agentId2);
+          const agentDir = join23(this.agentManager.getDataDir(), agentId2);
           const sharedDir = this.agentManager.getSharedDataDir();
           if (sharedDir) {
             try {
@@ -80217,8 +80247,8 @@ var require_dist = __commonJS({
 
 // ../org-manager/dist/task-service.js
 import { mkdirSync as mkdirSync17, writeFileSync as writeFileSync15, readFileSync as readFileSync21, existsSync as existsSync27, cpSync } from "node:fs";
-import { join as join23, resolve as resolve13 } from "node:path";
-import { homedir as homedir13 } from "node:os";
+import { join as join24, resolve as resolve13 } from "node:path";
+import { homedir as homedir14 } from "node:os";
 function formatLocalTimestamp(d = /* @__PURE__ */ new Date()) {
   const pad = (n2) => String(n2).padStart(2, "0");
   const dateStr = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
@@ -80694,8 +80724,8 @@ var init_task_service = __esm({
       }
       setSharedDataDir(dir) {
         this.sharedDataDir = dir;
-        mkdirSync17(join23(dir, "tasks"), { recursive: true });
-        mkdirSync17(join23(dir, "knowledge"), { recursive: true });
+        mkdirSync17(join24(dir, "tasks"), { recursive: true });
+        mkdirSync17(join24(dir, "knowledge"), { recursive: true });
       }
       getSharedDataDir() {
         return this.sharedDataDir;
@@ -81109,11 +81139,17 @@ var init_task_service = __esm({
                 lines.push(`- ${note.slice(0, PROMPT_DEP_NOTE_CHARS)}`);
               }
             }
+            if (depTask.completionSummary) {
+              lines.push(`**Completion Summary:** ${depTask.completionSummary}`);
+            }
             if (depTask.deliverables?.length) {
-              lines.push("**Deliverables (review these for background context):**");
-              for (const d of depTask.deliverables) {
-                const refInfo = d.type === "file" ? ` \u2014 File: \`${d.reference}\` (use \`file_read\` to inspect)` : d.type === "branch" ? ` [branch: ${d.reference}]` : d.reference ? ` \u2014 ref: \`${d.reference}\`` : "";
-                lines.push(`- ${d.summary ?? "(no summary)"}${refInfo}`);
+              const files = depTask.deliverables.filter((d) => d.type !== "branch" && d.reference);
+              if (files.length > 0) {
+                lines.push("**Deliverables (review these for background context):**");
+                for (const d of files) {
+                  const refInfo = d.type === "file" ? ` \u2014 File: \`${d.reference}\` (use \`file_read\` to inspect)` : d.reference ? ` \u2014 ref: \`${d.reference}\`` : "";
+                  lines.push(`- ${d.summary ?? "(no summary)"}${refInfo}`);
+                }
               }
             }
             depSections.push(lines.join("\n"));
@@ -81600,6 +81636,7 @@ ${c.content}`;
               blockedBy,
               result: row.result ?? void 0,
               deliverables: Array.isArray(row.deliverables) ? row.deliverables : void 0,
+              completionSummary: row.completionSummary ?? void 0,
               notes: Array.isArray(row.notes) ? row.notes : void 0,
               createdAt: row.createdAt instanceof Date ? row.createdAt.toISOString() : String(row.createdAt),
               updatedAt: row.updatedAt instanceof Date ? row.updatedAt.toISOString() : String(row.updatedAt),
@@ -81622,6 +81659,33 @@ ${c.content}`;
           log57.warn("Failed to load tasks from DB", { error: String(err) });
         }
       }
+      /**
+       * One-time migration: extract branch deliverable summaries into task.completionSummary
+       * and remove branch items from task.deliverables JSON.
+       */
+      async migrateBranchToCompletionSummary() {
+        let migrated = 0;
+        for (const [taskId2, task] of this.tasks) {
+          if (task.completionSummary)
+            continue;
+          if (!task.deliverables?.length)
+            continue;
+          const branchItem = task.deliverables.find((d) => d.type === "branch");
+          if (!branchItem)
+            continue;
+          task.completionSummary = branchItem.summary;
+          task.deliverables = task.deliverables.filter((d) => d.type !== "branch");
+          task.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+          if (this.taskRepo) {
+            this.taskRepo.updateCompletionSummary(taskId2, task.completionSummary).catch((err) => log57.warn("Failed to persist completionSummary migration", { taskId: taskId2, error: String(err) }));
+            this.taskRepo.updateDeliverables(taskId2, task.deliverables).catch((err) => log57.warn("Failed to persist deliverables cleanup", { taskId: taskId2, error: String(err) }));
+          }
+          migrated++;
+        }
+        if (migrated > 0) {
+          log57.info(`Migrated branch->completionSummary for ${migrated} tasks`);
+        }
+      }
       static PRIORITY_ORDER = {
         urgent: 0,
         high: 1,
@@ -82738,7 +82802,7 @@ Action: ${guidance}` : ""
         return { allowed: true };
       }
       // ─── Governance: Submit for Review ─────────────────────────────────────────
-      async submitForReview(taskId2, deliverables, reviewerId) {
+      async submitForReview(taskId2, deliverables, reviewerId, completionSummary) {
         const task = this.tasks.get(taskId2);
         if (!task)
           throw new Error(`Task not found: ${taskId2}`);
@@ -82789,8 +82853,14 @@ Action: ${guidance}` : ""
         if (reviewerId) {
           task.reviewerId = reviewerId;
         }
+        if (completionSummary) {
+          task.completionSummary = completionSummary;
+        }
         if (this.taskRepo) {
           this.taskRepo.updateDeliverables(task.id, task.deliverables).catch((err) => log57.warn("Failed to persist deliverables to DB", { taskId: task.id, error: String(err) }));
+          if (completionSummary) {
+            this.taskRepo.updateCompletionSummary(task.id, completionSummary).catch((err) => log57.warn("Failed to persist completionSummary to DB", { taskId: task.id, error: String(err) }));
+          }
           if (reviewerId) {
             this.taskRepo.update(task.id, { reviewerId }).catch((err) => log57.warn("Failed to persist reviewer change to DB", { taskId: task.id, error: String(err) }));
           }
@@ -82805,10 +82875,10 @@ Action: ${guidance}` : ""
             let reference = d.reference;
             if (builderMode && d.reference) {
               const dirMap = { agent: "agents", team: "teams", skill: "skills" };
-              const artBase = join23(homedir13(), ".markus", "builder-artifacts", dirMap[builderMode]);
+              const artBase = join24(homedir14(), ".markus", "builder-artifacts", dirMap[builderMode]);
               const ref = d.reference;
               if (ref.startsWith(artBase) && existsSync27(ref)) {
-                const mfPath = join23(ref, manifestFilename(builderMode));
+                const mfPath = join24(ref, manifestFilename(builderMode));
                 if (existsSync27(mfPath)) {
                   artifactType = builderMode;
                   try {
@@ -82881,8 +82951,12 @@ Action: ${guidance}` : ""
           parts.push(`[REVIEW REQUEST \u2014 ACTION REQUIRED] Task "${task.title}" (ID: ${task.id}) has been submitted for your review by ${assigneeName}.`);
           parts.push("");
           parts.push(`**Description:** ${task.description}`);
+          if (task.completionSummary) {
+            parts.push("");
+            parts.push(`**Summary:** ${task.completionSummary}`);
+          }
           if (task.deliverables && task.deliverables.length > 0) {
-            const files = task.deliverables.filter((d) => d.type !== "branch");
+            const files = task.deliverables.filter((d) => d.type !== "branch" && d.reference);
             if (files.length > 0) {
               parts.push("");
               parts.push("**Deliverables:**");
@@ -82892,12 +82966,6 @@ Action: ${guidance}` : ""
               if (files.length > REVIEWER_FILE_LIST_MAX)
                 parts.push(`  ... and ${files.length - REVIEWER_FILE_LIST_MAX} more`);
             }
-            const branch = task.deliverables.find((d) => d.type === "branch");
-            if (branch) {
-              parts.push(`**Branch:** ${branch.reference}`);
-              if (branch.summary)
-                parts.push(`**Summary:** ${branch.summary}`);
-            }
           }
           if (task.subtasks.length > 0) {
             const done = task.subtasks.filter((s2) => s2.status === "completed").length;
@@ -82984,7 +83052,7 @@ Action: ${guidance}` : ""
       publishDeliverablestoShared(task, deliverables) {
         if (!this.sharedDataDir)
           return;
-        const taskSharedDir = join23(this.sharedDataDir, "tasks", task.id);
+        const taskSharedDir = join24(this.sharedDataDir, "tasks", task.id);
         mkdirSync17(taskSharedDir, { recursive: true });
         const manifest = {
           taskId: task.id,
@@ -83000,7 +83068,7 @@ Action: ${guidance}` : ""
             testResults: d.testResults
           }))
         };
-        writeFileSync15(join23(taskSharedDir, "manifest.json"), JSON.stringify(manifest, null, 2));
+        writeFileSync15(join24(taskSharedDir, "manifest.json"), JSON.stringify(manifest, null, 2));
         for (const d of deliverables) {
           let src;
           if (d.type === "file" && d.reference) {
@@ -83008,7 +83076,7 @@ Action: ${guidance}` : ""
             if (existsSync27(src)) {
               try {
                 const destName = src.split("/").pop() ?? "deliverable";
-                cpSync(src, join23(taskSharedDir, destName), { recursive: true });
+                cpSync(src, join24(taskSharedDir, destName), { recursive: true });
               } catch (err) {
                 log57.warn("Failed to copy deliverable to shared space", { taskId: task.id, ref: d.reference, error: String(err) });
               }
@@ -83017,7 +83085,7 @@ Action: ${guidance}` : ""
           if (d.type === "file" && d.summary && src && !existsSync27(src)) {
             const baseName = d.reference.split("/").pop() ?? "deliverable";
             const safeName = baseName.replace(/[^a-zA-Z0-9_\u4e00-\u9fff.-]/g, "_").slice(0, 80);
-            writeFileSync15(join23(taskSharedDir, `${safeName}.md`), d.summary);
+            writeFileSync15(join24(taskSharedDir, `${safeName}.md`), d.summary);
           }
         }
         log57.info("Deliverables published to shared workspace", { taskId: task.id, dir: taskSharedDir });
@@ -83517,11 +83585,17 @@ ${reason}`
               for (const note of depTask.notes.slice(-PROMPT_DEP_NOTES_MAX).reverse())
                 lines.push(`- ${note.slice(0, PROMPT_DEP_NOTE_CHARS)}`);
             }
+            if (depTask.completionSummary) {
+              lines.push(`**Completion Summary:** ${depTask.completionSummary}`);
+            }
             if (depTask.deliverables?.length) {
-              lines.push("**Deliverables (review these for background context):**");
-              for (const d of depTask.deliverables) {
-                const refInfo = d.type === "file" ? ` \u2014 File: \`${d.reference}\` (use \`file_read\` to inspect)` : d.type === "branch" ? ` [branch: ${d.reference}]` : d.reference ? ` \u2014 ref: \`${d.reference}\`` : "";
-                lines.push(`- ${d.summary ?? "(no summary)"}${refInfo}`);
+              const files = depTask.deliverables.filter((d) => d.type !== "branch" && d.reference);
+              if (files.length > 0) {
+                lines.push("**Deliverables (review these for background context):**");
+                for (const d of files) {
+                  const refInfo = d.type === "file" ? ` \u2014 File: \`${d.reference}\` (use \`file_read\` to inspect)` : d.reference ? ` \u2014 ref: \`${d.reference}\`` : "";
+                  lines.push(`- ${d.summary ?? "(no summary)"}${refInfo}`);
+                }
               }
             }
             depSections.push(lines.join("\n"));
@@ -83886,9 +83960,9 @@ ${task.description}`;
 });
 
 // ../org-manager/dist/builder-service.js
-import { join as join24 } from "node:path";
+import { join as join25 } from "node:path";
 import { readdirSync as readdirSync9, readFileSync as readFileSync22, existsSync as existsSync28, writeFileSync as writeFileSync16, mkdirSync as mkdirSync18, copyFileSync as copyFileSync2, statSync as statSync6, cpSync as cpSync2 } from "node:fs";
-import { homedir as homedir14 } from "node:os";
+import { homedir as homedir15 } from "node:os";
 var log58, FS_HELPER, BuilderService;
 var init_builder_service = __esm({
   "../org-manager/dist/builder-service.js"() {
@@ -83898,7 +83972,7 @@ var init_builder_service = __esm({
     FS_HELPER = {
       existsSync: existsSync28,
       readFileSync: (p, _enc) => readFileSync22(p, "utf-8"),
-      join: join24
+      join: join25
     };
     BuilderService = class {
       orgService;
@@ -83918,19 +83992,19 @@ var init_builder_service = __esm({
         this.builtinTeamTemplatesDir = dir;
       }
       get baseDir() {
-        return join24(homedir14(), ".markus", "builder-artifacts");
+        return join25(homedir15(), ".markus", "builder-artifacts");
       }
       listArtifacts(type) {
         const types = type ? [type === "agent" ? "agents" : type === "team" ? "teams" : "skills"] : ["agents", "teams", "skills"];
         const artifacts = [];
         for (const typeDir of types) {
-          const dir = join24(this.baseDir, typeDir);
+          const dir = join25(this.baseDir, typeDir);
           if (!existsSync28(dir))
             continue;
           for (const entry of readdirSync9(dir, { withFileTypes: true })) {
             if (!entry.isDirectory())
               continue;
-            const artDir = join24(dir, entry.name);
+            const artDir = join25(dir, entry.name);
             const artType = typeDir === "agents" ? "agent" : typeDir === "teams" ? "team" : "skill";
             const manifest = readManifest(artDir, artType, FS_HELPER);
             const meta = manifest ? { ...manifest } : { name: entry.name };
@@ -83954,10 +84028,10 @@ var init_builder_service = __esm({
       }
       async installArtifact(type, name) {
         const typeDir = type === "agent" ? "agents" : type === "team" ? "teams" : "skills";
-        let artDir = join24(this.baseDir, typeDir, name);
+        let artDir = join25(this.baseDir, typeDir, name);
         if (!existsSync28(artDir)) {
           if (type === "team" && this.builtinTeamTemplatesDir) {
-            const builtinDir = join24(this.builtinTeamTemplatesDir, name);
+            const builtinDir = join25(this.builtinTeamTemplatesDir, name);
             if (existsSync28(builtinDir)) {
               artDir = builtinDir;
             } else {
@@ -83988,7 +84062,7 @@ var init_builder_service = __esm({
       async installAgent(artDir, manifest, mfName, artifactName) {
         const agentManager = this.orgService.getAgentManager();
         const agentName = manifest.displayName ?? manifest.name ?? artifactName;
-        const hasCustomRole = existsSync28(join24(artDir, "ROLE.md"));
+        const hasCustomRole = existsSync28(join25(artDir, "ROLE.md"));
         const skills = manifest.dependencies?.skills ?? [];
         const agentRole = manifest.agent?.agentRole ?? "worker";
         const agent = await this.orgService.hireAgent({
@@ -84000,17 +84074,17 @@ var init_builder_service = __esm({
           skipAutoStart: true,
           skipTemplateCopy: hasCustomRole
         });
-        const agentRoleDir = join24(agentManager.getDataDir(), agent.id, "role");
+        const agentRoleDir = join25(agentManager.getDataDir(), agent.id, "role");
         mkdirSync18(agentRoleDir, { recursive: true });
         for (const fname of readdirSync9(artDir)) {
           if (fname === mfName)
             continue;
-          const srcFile = join24(artDir, fname);
+          const srcFile = join25(artDir, fname);
           if (statSync6(srcFile).isFile()) {
-            copyFileSync2(srcFile, join24(agentRoleDir, fname));
+            copyFileSync2(srcFile, join25(agentRoleDir, fname));
           }
         }
-        writeFileSync16(join24(agentRoleDir, ".role-origin.json"), JSON.stringify({ customRole: true, source: "builder-artifact", artifact: artifactName, artifactType: "agent" }));
+        writeFileSync16(join25(agentRoleDir, ".role-origin.json"), JSON.stringify({ customRole: true, source: "builder-artifact", artifact: artifactName, artifactType: "agent" }));
         agent.reloadRole();
         await agentManager.startAgent(agent.id);
         return {
@@ -84032,8 +84106,8 @@ var init_builder_service = __esm({
           payload: { chatId: `group:${team.id}`, name: teamName, creatorId: "", creatorName: "" },
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         });
-        const announcementPath = join24(artDir, "ANNOUNCEMENT.md");
-        const normsPath = join24(artDir, "NORMS.md");
+        const announcementPath = join25(artDir, "ANNOUNCEMENT.md");
+        const normsPath = join25(artDir, "NORMS.md");
         const announcements = existsSync28(announcementPath) ? readFileSync22(announcementPath, "utf-8") : "";
         const norms = existsSync28(normsPath) ? readFileSync22(normsPath, "utf-8") : "";
         this.orgService.ensureTeamDataDir(team.id, announcements, norms);
@@ -84046,7 +84120,7 @@ var init_builder_service = __esm({
           const memberName = member.name ?? "Agent";
           const memberSkills = member.skills ?? [];
           const memberFilesDir = this.findMemberDir(artDir, memberName, usedMemberDirs, member.roleName);
-          const hasCustomRole = !!memberFilesDir && existsSync28(join24(memberFilesDir, "ROLE.md"));
+          const hasCustomRole = !!memberFilesDir && existsSync28(join25(memberFilesDir, "ROLE.md"));
           if (memberFilesDir)
             usedMemberDirs.add(memberFilesDir);
           log58.info("installTeam: member lookup", { memberName, memberFilesDir, hasCustomRole });
@@ -84062,17 +84136,17 @@ var init_builder_service = __esm({
               skipAutoStart: true,
               skipTemplateCopy: hasCustomRole
             });
-            const agentRoleDir = join24(agentManager.getDataDir(), agent.id, "role");
+            const agentRoleDir = join25(agentManager.getDataDir(), agent.id, "role");
             mkdirSync18(agentRoleDir, { recursive: true });
             if (memberFilesDir && existsSync28(memberFilesDir)) {
               for (const fname of readdirSync9(memberFilesDir)) {
-                const srcFile = join24(memberFilesDir, fname);
+                const srcFile = join25(memberFilesDir, fname);
                 if (statSync6(srcFile).isFile()) {
-                  copyFileSync2(srcFile, join24(agentRoleDir, fname));
+                  copyFileSync2(srcFile, join25(agentRoleDir, fname));
                 }
               }
             }
-            writeFileSync16(join24(agentRoleDir, ".role-origin.json"), JSON.stringify({ customRole: true, source: "builder-artifact", artifact: artifactName, artifactType: "team" }));
+            writeFileSync16(join25(agentRoleDir, ".role-origin.json"), JSON.stringify({ customRole: true, source: "builder-artifact", artifact: artifactName, artifactType: "team" }));
             agent.reloadRole();
             if (memberRole === "manager") {
               await this.orgService.updateTeam(team.id, { managerId: agent.id, managerType: "agent" });
@@ -84110,13 +84184,13 @@ var init_builder_service = __esm({
         const workflowFiles = manifest.team?.workflows ?? [];
         const copiedWorkflows = [];
         if (workflowFiles.length > 0) {
-          const wfDir = join24(homedir14(), ".markus", "teams", team.id, "workflows");
+          const wfDir = join25(homedir15(), ".markus", "teams", team.id, "workflows");
           mkdirSync18(wfDir, { recursive: true });
           for (const wfRelPath of workflowFiles) {
-            const srcPath = join24(artDir, wfRelPath);
+            const srcPath = join25(artDir, wfRelPath);
             if (existsSync28(srcPath)) {
               const destName = wfRelPath.split("/").pop() ?? wfRelPath;
-              copyFileSync2(srcPath, join24(wfDir, destName));
+              copyFileSync2(srcPath, join25(wfDir, destName));
               copiedWorkflows.push(destName);
               log58.info("installTeam: copied workflow", { workflow: destName, teamId: team.id });
             } else {
@@ -84134,19 +84208,19 @@ var init_builder_service = __esm({
        * Returns the absolute path to the member directory, or null if not found.
        */
       findMemberDir(artDir, memberName, usedDirs, roleName) {
-        const membersBase = join24(artDir, "members");
+        const membersBase = join25(artDir, "members");
         if (!existsSync28(membersBase))
           return null;
         const nameSlug = kebab(memberName);
         if (nameSlug && !/^pkg-/.test(nameSlug)) {
-          const exact = join24(membersBase, nameSlug);
+          const exact = join25(membersBase, nameSlug);
           if (existsSync28(exact) && !usedDirs.has(exact))
             return exact;
         }
         if (roleName) {
           const roleSlug = kebab(roleName);
           if (roleSlug && !/^pkg-/.test(roleSlug)) {
-            const roleDir = join24(membersBase, roleSlug);
+            const roleDir = join25(membersBase, roleSlug);
             if (existsSync28(roleDir) && !usedDirs.has(roleDir))
               return roleDir;
           }
@@ -84155,10 +84229,10 @@ var init_builder_service = __esm({
           for (const entry of readdirSync9(membersBase, { withFileTypes: true })) {
             if (!entry.isDirectory())
               continue;
-            const candidateDir = join24(membersBase, entry.name);
+            const candidateDir = join25(membersBase, entry.name);
             if (usedDirs.has(candidateDir))
               continue;
-            const rolePath = join24(candidateDir, "ROLE.md");
+            const rolePath = join25(candidateDir, "ROLE.md");
             if (!existsSync28(rolePath))
               continue;
             try {
@@ -84176,19 +84250,19 @@ var init_builder_service = __esm({
         } catch {
         }
         try {
-          const remaining = readdirSync9(membersBase, { withFileTypes: true }).filter((e) => e.isDirectory() && !usedDirs.has(join24(membersBase, e.name)));
+          const remaining = readdirSync9(membersBase, { withFileTypes: true }).filter((e) => e.isDirectory() && !usedDirs.has(join25(membersBase, e.name)));
           if (remaining.length === 1)
-            return join24(membersBase, remaining[0].name);
+            return join25(membersBase, remaining[0].name);
         } catch {
         }
         return null;
       }
       async installSkill(artDir, manifest, artifactName) {
-        const skillDir = join24(homedir14(), ".markus", "skills", artifactName);
+        const skillDir = join25(homedir15(), ".markus", "skills", artifactName);
         mkdirSync18(skillDir, { recursive: true });
         for (const fname of readdirSync9(artDir)) {
-          const srcFile = join24(artDir, fname);
-          const destFile = join24(skillDir, fname);
+          const srcFile = join25(artDir, fname);
+          const destFile = join25(skillDir, fname);
           if (statSync6(srcFile).isFile()) {
             copyFileSync2(srcFile, destFile);
           } else if (statSync6(srcFile).isDirectory()) {
@@ -84198,7 +84272,7 @@ var init_builder_service = __esm({
         if (this.skillRegistry) {
           try {
             const skillFile = manifest.skill?.skillFile ?? "SKILL.md";
-            const instrPath = join24(skillDir, skillFile);
+            const instrPath = join25(skillDir, skillFile);
             const instructions = existsSync28(instrPath) ? readFileSync22(instrPath, "utf-8").replace(/^---\s*\n[\s\S]*?\n---\s*\n?/, "").trim() : void 0;
             this.skillRegistry.register({
               manifest: {
@@ -94776,8 +94850,8 @@ var require_common = __commonJS({
         }
         return debug;
       }
-      function extend(namespace, delimiter) {
-        const newDebug = createDebug(this.namespace + (typeof delimiter === "undefined" ? ":" : delimiter) + namespace);
+      function extend(namespace, delimiter2) {
+        const newDebug = createDebug(this.namespace + (typeof delimiter2 === "undefined" ? ":" : delimiter2) + namespace);
         newDebug.log = this.log;
         return newDebug;
       }
@@ -96189,14 +96263,14 @@ var require_axios = __commonJS({
         }
       });
     };
-    var toObjectSet = (arrayOrString, delimiter) => {
+    var toObjectSet = (arrayOrString, delimiter2) => {
       const obj = {};
       const define = (arr) => {
         arr.forEach((value) => {
           obj[value] = true;
         });
       };
-      isArray2(arrayOrString) ? define(arrayOrString) : define(String(arrayOrString).split(delimiter));
+      isArray2(arrayOrString) ? define(arrayOrString) : define(String(arrayOrString).split(delimiter2));
       return obj;
     };
     var noop = () => {
@@ -96677,14 +96751,14 @@ var require_axios = __commonJS({
       navigator: _navigator,
       origin
     });
-    var platform7 = {
+    var platform9 = {
       ...utils,
       ...platform$1
     };
     function toURLEncodedForm(data, options) {
-      return toFormData(data, new platform7.classes.URLSearchParams(), {
+      return toFormData(data, new platform9.classes.URLSearchParams(), {
         visitor: function(value, key2, path, helpers) {
-          if (platform7.isNode && utils$1.isBuffer(value)) {
+          if (platform9.isNode && utils$1.isBuffer(value)) {
             this.append(key2, value.toString("base64"));
             return false;
           }
@@ -96837,8 +96911,8 @@ var require_axios = __commonJS({
       maxContentLength: -1,
       maxBodyLength: -1,
       env: {
-        FormData: platform7.classes.FormData,
-        Blob: platform7.classes.Blob
+        FormData: platform9.classes.FormData,
+        Blob: platform9.classes.Blob
       },
       validateStatus: function validateStatus(status) {
         return status >= 200 && status < 300;
@@ -97201,7 +97275,7 @@ var require_axios = __commonJS({
     }
     var DATA_URL_PATTERN = /^(?:([^;]+);)?(?:[^;]+;)?(base64|),([\s\S]*)$/;
     function fromDataURI(uri, asBlob, options) {
-      const _Blob = options && options.Blob || platform7.classes.Blob;
+      const _Blob = options && options.Blob || platform9.classes.Blob;
       const protocol = parseProtocol(uri);
       if (asBlob === void 0 && _Blob) {
         asBlob = true;
@@ -97359,7 +97433,7 @@ var require_axios = __commonJS({
       }
     };
     var readBlob$1 = readBlob;
-    var BOUNDARY_ALPHABET = platform7.ALPHABET.ALPHA_DIGIT + "-_";
+    var BOUNDARY_ALPHABET = platform9.ALPHABET.ALPHA_DIGIT + "-_";
     var textEncoder = typeof TextEncoder === "function" ? new TextEncoder() : new util__default["default"].TextEncoder();
     var CRLF = "\r\n";
     var CRLF_BYTES = textEncoder.encode(CRLF);
@@ -97405,7 +97479,7 @@ var require_axios = __commonJS({
       const {
         tag = "form-data-boundary",
         size = 25,
-        boundary = tag + "-" + platform7.generateString(size, BOUNDARY_ALPHABET)
+        boundary = tag + "-" + platform9.generateString(size, BOUNDARY_ALPHABET)
       } = options || {};
       if (!utils$1.isFormData(form)) {
         throw TypeError("FormData instance required");
@@ -97634,7 +97708,7 @@ var require_axios = __commonJS({
     var isBrotliSupported = utils$1.isFunction(zlib__default["default"].createBrotliDecompress);
     var { http: httpFollow, https: httpsFollow } = followRedirects__default["default"];
     var isHttps = /https:?/;
-    var supportedProtocols = platform7.protocols.map((protocol) => {
+    var supportedProtocols = platform9.protocols.map((protocol) => {
       return protocol + ":";
     });
     var flushOnFinish = (stream2, [throttled, flush]) => {
@@ -97886,7 +97960,7 @@ var require_axios = __commonJS({
           }
         });
         const fullPath = buildFullPath(config.baseURL, config.url, config.allowAbsoluteUrls);
-        const parsed = new URL(fullPath, platform7.hasBrowserEnv ? platform7.origin : void 0);
+        const parsed = new URL(fullPath, platform9.hasBrowserEnv ? platform9.origin : void 0);
         const protocol = parsed.protocol || supportedProtocols[0];
         if (protocol === "data:") {
           if (config.maxContentLength > -1) {
@@ -98294,14 +98368,14 @@ var require_axios = __commonJS({
         }
       });
     };
-    var isURLSameOrigin = platform7.hasStandardBrowserEnv ? /* @__PURE__ */ ((origin2, isMSIE) => (url2) => {
-      url2 = new URL(url2, platform7.origin);
+    var isURLSameOrigin = platform9.hasStandardBrowserEnv ? /* @__PURE__ */ ((origin2, isMSIE) => (url2) => {
+      url2 = new URL(url2, platform9.origin);
       return origin2.protocol === url2.protocol && origin2.host === url2.host && (isMSIE || origin2.port === url2.port);
     })(
-      new URL(platform7.origin),
-      platform7.navigator && /(msie|trident)/i.test(platform7.navigator.userAgent)
+      new URL(platform9.origin),
+      platform9.navigator && /(msie|trident)/i.test(platform9.navigator.userAgent)
     ) : () => true;
-    var cookies = platform7.hasStandardBrowserEnv ? (
+    var cookies = platform9.hasStandardBrowserEnv ? (
       // Standard browser envs support document.cookie
       {
         write(name, value, expires, path, domain, secure, sameSite) {
@@ -98442,7 +98516,7 @@ var require_axios = __commonJS({
         );
       }
       if (utils$1.isFormData(data)) {
-        if (platform7.hasStandardBrowserEnv || platform7.hasStandardBrowserWebWorkerEnv) {
+        if (platform9.hasStandardBrowserEnv || platform9.hasStandardBrowserWebWorkerEnv) {
           headers.setContentType(void 0);
         } else if (utils$1.isFunction(data.getHeaders)) {
           const formHeaders = data.getHeaders();
@@ -98454,7 +98528,7 @@ var require_axios = __commonJS({
           });
         }
       }
-      if (platform7.hasStandardBrowserEnv) {
+      if (platform9.hasStandardBrowserEnv) {
         withXSRFToken && utils$1.isFunction(withXSRFToken) && (withXSRFToken = withXSRFToken(newConfig));
         if (withXSRFToken || withXSRFToken !== false && isURLSameOrigin(newConfig.url)) {
           const xsrfValue = xsrfHeaderName && xsrfCookieName && cookies.read(xsrfCookieName);
@@ -98592,7 +98666,7 @@ var require_axios = __commonJS({
           }
         }
         const protocol = parseProtocol(_config.url);
-        if (protocol && platform7.protocols.indexOf(protocol) === -1) {
+        if (protocol && platform9.protocols.indexOf(protocol) === -1) {
           reject(
             new AxiosError$1(
               "Unsupported protocol " + protocol + ":",
@@ -98752,7 +98826,7 @@ var require_axios = __commonJS({
       const encodeText = isFetchSupported && (typeof TextEncoder$1 === "function" ? /* @__PURE__ */ ((encoder) => (str) => encoder.encode(str))(new TextEncoder$1()) : async (str) => new Uint8Array(await new Request(str).arrayBuffer()));
       const supportsRequestStream = isRequestSupported && isReadableStreamSupported && test(() => {
         let duplexAccessed = false;
-        const hasContentType = new Request(platform7.origin, {
+        const hasContentType = new Request(platform9.origin, {
           body: new ReadableStream$1(),
           method: "POST",
           get duplex() {
@@ -98789,7 +98863,7 @@ var require_axios = __commonJS({
           return body.size;
         }
         if (utils$1.isSpecCompliantForm(body)) {
-          const _request = new Request(platform7.origin, {
+          const _request = new Request(platform9.origin, {
             method: "POST",
             body
           });
@@ -193488,9 +193562,9 @@ var init_sse_handler = __esm({
 });
 
 // ../org-manager/dist/skill-service.js
-import { join as join25, resolve as resolve14 } from "node:path";
+import { join as join26, resolve as resolve14 } from "node:path";
 import { existsSync as existsSync29, writeFileSync as writeFileSync17, mkdirSync as mkdirSync19, readFileSync as readFileSync23, readdirSync as readdirSync10, copyFileSync as copyFileSync3 } from "node:fs";
-import { homedir as homedir15 } from "node:os";
+import { homedir as homedir16 } from "node:os";
 import { execSync as execSync3 } from "node:child_process";
 async function searchSkillHub(query2) {
   const cacheKey = "skillhub-data";
@@ -193616,9 +193690,9 @@ async function searchRegistries(query2) {
 }
 async function installSkill(request, skillRegistry) {
   const { name: skillName, source, slug, sourceUrl, description, category, version, githubRepo, githubSkillPath } = request;
-  const skillsDir = join25(homedir15(), ".markus", "skills");
+  const skillsDir = join26(homedir16(), ".markus", "skills");
   const safeName = skillName.replace(/[^a-zA-Z0-9_-]/g, "-").toLowerCase();
-  const targetDir = join25(skillsDir, safeName);
+  const targetDir = join26(skillsDir, safeName);
   mkdirSync19(skillsDir, { recursive: true });
   let installed = false;
   let installMethod = "metadata-only";
@@ -193627,7 +193701,7 @@ async function installSkill(request, skillRegistry) {
     if (existsSync29(builtinDir)) {
       mkdirSync19(targetDir, { recursive: true });
       for (const file of readdirSync10(builtinDir)) {
-        copyFileSync3(join25(builtinDir, file), join25(targetDir, file));
+        copyFileSync3(join26(builtinDir, file), join26(targetDir, file));
       }
       installed = true;
       installMethod = "builtin-copy";
@@ -193638,7 +193712,7 @@ async function installSkill(request, skillRegistry) {
       const zipUrl = `https://wry-manatee-359.convex.site/api/v1/download?slug=${encodeURIComponent(slug)}`;
       const zipResp = await fetch(zipUrl, { signal: AbortSignal.timeout(2e4) });
       if (zipResp.ok) {
-        const tmpZip = join25(skillsDir, `_tmp_${safeName}.zip`);
+        const tmpZip = join26(skillsDir, `_tmp_${safeName}.zip`);
         const buffer = Buffer.from(await zipResp.arrayBuffer());
         writeFileSync17(tmpZip, buffer);
         mkdirSync19(targetDir, { recursive: true });
@@ -193666,7 +193740,7 @@ async function installSkill(request, skillRegistry) {
       const mdResp = await fetch(skillMdUrl, { signal: AbortSignal.timeout(15e3) });
       if (mdResp.ok) {
         mkdirSync19(targetDir, { recursive: true });
-        writeFileSync17(join25(targetDir, "SKILL.md"), await mdResp.text(), "utf-8");
+        writeFileSync17(join26(targetDir, "SKILL.md"), await mdResp.text(), "utf-8");
         installed = true;
         installMethod = "github-skillmd";
       }
@@ -193680,7 +193754,7 @@ async function installSkill(request, skillRegistry) {
         const mdResp = await fetch(rootMd, { signal: AbortSignal.timeout(15e3) });
         if (mdResp.ok) {
           mkdirSync19(targetDir, { recursive: true });
-          writeFileSync17(join25(targetDir, "SKILL.md"), await mdResp.text(), "utf-8");
+          writeFileSync17(join26(targetDir, "SKILL.md"), await mdResp.text(), "utf-8");
           installed = true;
           installMethod = "github-root-skillmd";
         }
@@ -193694,7 +193768,7 @@ async function installSkill(request, skillRegistry) {
       const zipUrl = `https://wry-manatee-359.convex.site/api/v1/download?slug=${encodeURIComponent(trySlug)}`;
       const zipResp = await fetch(zipUrl, { signal: AbortSignal.timeout(2e4) });
       if (zipResp.ok) {
-        const tmpZip = join25(skillsDir, `_tmp_${safeName}.zip`);
+        const tmpZip = join26(skillsDir, `_tmp_${safeName}.zip`);
         const buffer = Buffer.from(await zipResp.arrayBuffer());
         writeFileSync17(tmpZip, buffer);
         mkdirSync19(targetDir, { recursive: true });
@@ -193717,7 +193791,7 @@ async function installSkill(request, skillRegistry) {
   if (!installed) {
     throw new Error(`Download failed for "${skillName}". Source: ${sourceUrl ?? slug ?? "unknown"}`);
   }
-  const skillMfPath = join25(targetDir, manifestFilename("skill"));
+  const skillMfPath = join26(targetDir, manifestFilename("skill"));
   const skillSource = { type: source ?? "local", url: sourceUrl ?? "" };
   if (!existsSync29(skillMfPath)) {
     const raw = {
@@ -193767,10 +193841,10 @@ var init_skill_service = __esm({
 
 // ../org-manager/dist/api-server.js
 import { createServer as createServer2 } from "node:http";
-import { join as join26, resolve as resolve15, dirname as dirname8 } from "node:path";
+import { join as join27, resolve as resolve15, dirname as dirname8 } from "node:path";
 import { readdirSync as readdirSync11, readFileSync as readFileSync24, existsSync as existsSync30, writeFileSync as writeFileSync18, mkdirSync as mkdirSync20, rmSync as rmSync3, statSync as statSync7 } from "node:fs";
 import { gzipSync } from "node:zlib";
-import { homedir as homedir16 } from "node:os";
+import { homedir as homedir17 } from "node:os";
 import { execSync as execSync4 } from "node:child_process";
 async function signToken(payload, secret) {
   const header = btoa(JSON.stringify({ alg: "HS256", typ: "JWT" }));
@@ -194211,16 +194285,16 @@ ${cleanText}`,
             const slug = kebab(name, "hub-pkg");
             const mode = data.itemType === "team" ? "team" : data.itemType === "skill" ? "skill" : "agent";
             const typeDir = mode === "agent" ? "agents" : mode === "team" ? "teams" : "skills";
-            const artDir = join26(homedir16(), ".markus", "builder-artifacts", typeDir, slug);
+            const artDir = join27(homedir17(), ".markus", "builder-artifacts", typeDir, slug);
             mkdirSync20(artDir, { recursive: true });
             if (data.files && Object.keys(data.files).length > 0) {
               for (const [fname, content] of Object.entries(data.files)) {
-                const filePath = join26(artDir, fname);
+                const filePath = join27(artDir, fname);
                 mkdirSync20(dirname8(filePath), { recursive: true });
                 writeFileSync18(filePath, content, "utf-8");
               }
             } else if (data.config) {
-              writeFileSync18(join26(artDir, manifestFilename(mode)), JSON.stringify(data.config, null, 2), "utf-8");
+              writeFileSync18(join27(artDir, manifestFilename(mode)), JSON.stringify(data.config, null, 2), "utf-8");
             }
             return self2.builderService.installArtifact(mode, slug);
           }
@@ -194228,7 +194302,7 @@ ${cleanText}`,
       }
       readHubToken() {
         try {
-          const tokenPath = join26(homedir16(), ".markus", "hub-token");
+          const tokenPath = join27(homedir17(), ".markus", "hub-token");
           return existsSync30(tokenPath) ? readFileSync24(tokenPath, "utf-8").trim() : void 0;
         } catch {
           return void 0;
@@ -195345,7 +195419,7 @@ ${cleanText}`,
           }
           this.orgService.syncHumanIdentity(userRow.id, "default", userRow.name, userRow.role, userRow.email ?? void 0);
           try {
-            const tokenPath = join26(homedir16(), ".markus", "hub-token");
+            const tokenPath = join27(homedir17(), ".markus", "hub-token");
             mkdirSync20(dirname8(tokenPath), { recursive: true });
             writeFileSync18(tokenPath, hubToken, "utf-8");
           } catch {
@@ -195568,10 +195642,10 @@ ${cleanText}`,
             this.json(res, 400, { error: "Image too large (max 2MB)" });
             return;
           }
-          const avatarDir = join26(homedir16(), ".markus", "avatars");
+          const avatarDir = join27(homedir17(), ".markus", "avatars");
           mkdirSync20(avatarDir, { recursive: true });
           const filename = `${targetType}_${targetId}.${ext}`;
-          writeFileSync18(join26(avatarDir, filename), buf);
+          writeFileSync18(join27(avatarDir, filename), buf);
           const avatarUrl = `/api/avatars/${filename}`;
           if (targetType === "user" && this.storage) {
             this.storage.userRepo.updateAvatarUrl(targetId, avatarUrl);
@@ -195590,7 +195664,7 @@ ${cleanText}`,
             this.json(res, 400, { error: "Invalid filename" });
             return;
           }
-          const filePath = join26(homedir16(), ".markus", "avatars", filename);
+          const filePath = join27(homedir17(), ".markus", "avatars", filename);
           if (existsSync30(filePath) && statSync7(filePath).isFile()) {
             this.serveStaticFile(res, filePath);
           } else {
@@ -196642,7 +196716,7 @@ ${cleanText}`,
             this.json(res, 400, { error: "Invalid filename" });
             return;
           }
-          const filePath = join26(this.orgService.getTeamDataDir(teamId), filename);
+          const filePath = join27(this.orgService.getTeamDataDir(teamId), filename);
           if (!existsSync30(filePath)) {
             this.json(res, 404, { error: "File not found" });
             return;
@@ -196666,7 +196740,7 @@ ${cleanText}`,
           const content = body["content"];
           const dir = this.orgService.getTeamDataDir(teamId);
           mkdirSync20(dir, { recursive: true });
-          writeFileSync18(join26(dir, filename), content ?? "", "utf-8");
+          writeFileSync18(join27(dir, filename), content ?? "", "utf-8");
           this.json(res, 200, { ok: true });
           return;
         }
@@ -196731,18 +196805,42 @@ ${cleanText}`,
         }
         if (path === "/api/tasks/deliverables" && req.method === "GET") {
           const projectId = url.searchParams.get("projectId") ?? void 0;
-          const all = this.taskService.listTasks({ projectId });
-          const items = all.filter((t2) => t2.deliverables && t2.deliverables.length > 0).map((t2) => ({
-            taskId: t2.id,
-            taskTitle: t2.title,
-            taskStatus: t2.status,
-            projectId: t2.projectId,
-            requirementId: t2.requirementId,
-            assignedAgentId: t2.assignedAgentId,
-            updatedAt: t2.updatedAt,
-            deliverables: t2.deliverables
-          }));
-          this.json(res, 200, { items });
+          if (this.deliverableService) {
+            const { results } = this.deliverableService.search({ projectId, limit: 500 });
+            const grouped = /* @__PURE__ */ new Map();
+            for (const d of results) {
+              if (!d.taskId)
+                continue;
+              if (!grouped.has(d.taskId)) {
+                const task = this.taskService.getTask(d.taskId);
+                grouped.set(d.taskId, {
+                  taskId: d.taskId,
+                  taskTitle: task?.title ?? "",
+                  taskStatus: task?.status ?? "",
+                  projectId: task?.projectId,
+                  requirementId: task?.requirementId,
+                  assignedAgentId: task?.assignedAgentId,
+                  updatedAt: task?.updatedAt,
+                  deliverables: []
+                });
+              }
+              grouped.get(d.taskId).deliverables.push(d);
+            }
+            this.json(res, 200, { items: [...grouped.values()] });
+          } else {
+            const all = this.taskService.listTasks({ projectId });
+            const items = all.filter((t2) => t2.deliverables && t2.deliverables.length > 0).map((t2) => ({
+              taskId: t2.id,
+              taskTitle: t2.title,
+              taskStatus: t2.status,
+              projectId: t2.projectId,
+              requirementId: t2.requirementId,
+              assignedAgentId: t2.assignedAgentId,
+              updatedAt: t2.updatedAt,
+              deliverables: t2.deliverables
+            }));
+            this.json(res, 200, { items });
+          }
           return;
         }
         if (path === "/api/deliverables" && req.method === "GET") {
@@ -197317,7 +197415,7 @@ ${cleanText}`,
             const files = {};
             if (teamDataDir && existsSync30(teamDataDir)) {
               for (const fname of readdirSync11(teamDataDir)) {
-                const fpath = join26(teamDataDir, fname);
+                const fpath = join27(teamDataDir, fname);
                 try {
                   files[fname] = readFileSync24(fpath, "utf-8");
                 } catch {
@@ -197334,7 +197432,7 @@ ${cleanText}`,
                   continue;
                 const slug = kebab(agent.config.name, agentId2);
                 for (const fname of roleFileNames) {
-                  const fpath = join26(roleDir, fname);
+                  const fpath = join27(roleDir, fname);
                   if (existsSync30(fpath)) {
                     try {
                       files[`members/${slug}/${fname}`] = readFileSync24(fpath, "utf-8");
@@ -197353,11 +197451,11 @@ ${cleanText}`,
         }
         if (path.match(/^\/api\/skills\/[^/]+\/files$/) && req.method === "GET") {
           const skillName = decodeURIComponent(path.split("/")[3]);
-          const skillDir = join26(homedir16(), ".markus", "skills", skillName);
+          const skillDir = join27(homedir17(), ".markus", "skills", skillName);
           const files = {};
           if (existsSync30(skillDir)) {
             for (const fname of readdirSync11(skillDir)) {
-              const fpath = join26(skillDir, fname);
+              const fpath = join27(skillDir, fname);
               try {
                 files[fname] = readFileSync24(fpath, "utf-8");
               } catch {
@@ -197634,7 +197732,7 @@ ${cleanText}`,
             const files = [];
             const filesMap = {};
             for (const name of allowedNames) {
-              const filePath = join26(roleDir, name);
+              const filePath = join27(roleDir, name);
               if (existsSync30(filePath)) {
                 const content = readFileSync24(filePath, "utf-8");
                 files.push({ name, content });
@@ -197668,7 +197766,7 @@ ${cleanText}`,
             }
             const body = await this.readBody(req);
             const content = body["content"] ?? "";
-            writeFileSync18(join26(roleDir, filename), content, "utf-8");
+            writeFileSync18(join27(roleDir, filename), content, "utf-8");
             this.json(res, 200, { ok: true });
           } catch {
             this.json(res, 404, { error: `Agent not found: ${agentId2}` });
@@ -199025,9 +199123,9 @@ EXPLANATION_END`;
             return;
           }
           let deletedFs = false;
-          const skillsDir = join26(homedir16(), ".markus", "skills");
+          const skillsDir = join27(homedir17(), ".markus", "skills");
           const safeName = skillName.replace(/[^a-zA-Z0-9_-]/g, "-").toLowerCase();
-          const targetDir = join26(skillsDir, safeName);
+          const targetDir = join27(skillsDir, safeName);
           if (existsSync30(targetDir)) {
             try {
               execSync4(`rm -rf "${targetDir}"`, { timeout: 1e4 });
@@ -199080,7 +199178,7 @@ EXPLANATION_END`;
             const rawType = artMatch[1];
             const name = decodeURIComponent(artMatch[2]);
             const typeDir = rawType.endsWith("s") ? rawType : rawType + "s";
-            const artDir = join26(homedir16(), ".markus", "builder-artifacts", typeDir, name);
+            const artDir = join27(homedir17(), ".markus", "builder-artifacts", typeDir, name);
             if (!existsSync30(artDir)) {
               this.json(res, 404, { error: "Artifact not found" });
               return;
@@ -199091,10 +199189,10 @@ EXPLANATION_END`;
                 for (const entry of readdirSync11(dir, { withFileTypes: true })) {
                   const relPath = prefix ? `${prefix}/${entry.name}` : entry.name;
                   if (entry.isDirectory()) {
-                    readDir(join26(dir, entry.name), relPath);
+                    readDir(join27(dir, entry.name), relPath);
                   } else {
                     try {
-                      files[relPath] = readFileSync24(join26(dir, entry.name), "utf-8");
+                      files[relPath] = readFileSync24(join27(dir, entry.name), "utf-8");
                     } catch {
                     }
                   }
@@ -199115,7 +199213,7 @@ EXPLANATION_END`;
             const agentManager = this.orgService.getAgentManager();
             const dataDir = agentManager.getDataDir();
             for (const agentInfo of agentManager.listAgents()) {
-              const originPath = join26(dataDir, agentInfo.id, "role", ".role-origin.json");
+              const originPath = join27(dataDir, agentInfo.id, "role", ".role-origin.json");
               if (existsSync30(originPath)) {
                 try {
                   const origin = JSON.parse(readFileSync24(originPath, "utf-8"));
@@ -199151,12 +199249,12 @@ EXPLANATION_END`;
                 }
               }
             }
-            const skillArtDir = join26(homedir16(), ".markus", "builder-artifacts", "skills");
-            const skillsDir = join26(homedir16(), ".markus", "skills");
+            const skillArtDir = join27(homedir17(), ".markus", "builder-artifacts", "skills");
+            const skillsDir = join27(homedir17(), ".markus", "skills");
             if (existsSync30(skillArtDir)) {
               try {
                 for (const entry of readdirSync11(skillArtDir, { withFileTypes: true })) {
-                  if (entry.isDirectory() && existsSync30(join26(skillsDir, entry.name))) {
+                  if (entry.isDirectory() && existsSync30(join27(skillsDir, entry.name))) {
                     installed[`skill/${entry.name}`] = {};
                   }
                 }
@@ -199195,15 +199293,15 @@ EXPLANATION_END`;
             if (!manifest.source)
               manifest.source = { type: "local" };
             const mfName = manifestFilename(pkgType);
-            const artDir = join26(homedir16(), ".markus", "builder-artifacts", typeDir, manifest.name);
+            const artDir = join27(homedir17(), ".markus", "builder-artifacts", typeDir, manifest.name);
             mkdirSync20(artDir, { recursive: true });
-            writeFileSync18(join26(artDir, mfName), JSON.stringify(manifest, null, 2), "utf-8");
+            writeFileSync18(join27(artDir, mfName), JSON.stringify(manifest, null, 2), "utf-8");
             const artFiles = artifact.files;
             if (artFiles) {
               for (const [fn, c] of Object.entries(artFiles)) {
                 if (fn === mfName)
                   continue;
-                const filePath = join26(artDir, fn);
+                const filePath = join27(artDir, fn);
                 mkdirSync20(dirname8(filePath), { recursive: true });
                 writeFileSync18(filePath, c, "utf-8");
               }
@@ -199212,40 +199310,40 @@ EXPLANATION_END`;
               const fileSet = new Set(artFiles ? Object.keys(artFiles) : []);
               const announcement = artifact.announcement;
               if (announcement && !fileSet.has("ANNOUNCEMENT.md")) {
-                writeFileSync18(join26(artDir, "ANNOUNCEMENT.md"), announcement, "utf-8");
+                writeFileSync18(join27(artDir, "ANNOUNCEMENT.md"), announcement, "utf-8");
               }
               const norms = artifact.norms;
               if (norms && !fileSet.has("NORMS.md")) {
-                writeFileSync18(join26(artDir, "NORMS.md"), norms, "utf-8");
+                writeFileSync18(join27(artDir, "NORMS.md"), norms, "utf-8");
               }
               const rawMembers = Array.isArray(artifact.team?.members) ? artifact.team.members : Array.isArray(artifact.members) ? artifact.members : [];
               for (const [idx, m] of rawMembers.entries()) {
                 const mName = m.name ?? "Agent";
                 const slug = kebab(mName, "member-" + idx);
-                const memberDir = join26(artDir, "members", slug);
+                const memberDir = join27(artDir, "members", slug);
                 const roleContent = m.roleContent || m.role_md;
                 const policiesContent = m.policiesContent || m.policies_md;
                 const contextContent = m.contextContent || m.context_md;
                 if (roleContent && !fileSet.has(`members/${slug}/ROLE.md`)) {
                   mkdirSync20(memberDir, { recursive: true });
-                  writeFileSync18(join26(memberDir, "ROLE.md"), roleContent, "utf-8");
+                  writeFileSync18(join27(memberDir, "ROLE.md"), roleContent, "utf-8");
                 }
                 if (policiesContent && !fileSet.has(`members/${slug}/POLICIES.md`)) {
                   mkdirSync20(memberDir, { recursive: true });
-                  writeFileSync18(join26(memberDir, "POLICIES.md"), policiesContent, "utf-8");
+                  writeFileSync18(join27(memberDir, "POLICIES.md"), policiesContent, "utf-8");
                 }
                 if (contextContent && !fileSet.has(`members/${slug}/CONTEXT.md`)) {
                   mkdirSync20(memberDir, { recursive: true });
-                  writeFileSync18(join26(memberDir, "CONTEXT.md"), contextContent, "utf-8");
+                  writeFileSync18(join27(memberDir, "CONTEXT.md"), contextContent, "utf-8");
                 }
               }
               const memberFiles = artifact.memberFiles;
               if (memberFiles) {
                 for (const [slug, files] of Object.entries(memberFiles)) {
-                  const memberDir = join26(artDir, "members", slug);
+                  const memberDir = join27(artDir, "members", slug);
                   mkdirSync20(memberDir, { recursive: true });
                   for (const [fn, c] of Object.entries(files))
-                    writeFileSync18(join26(memberDir, fn), c, "utf-8");
+                    writeFileSync18(join27(memberDir, fn), c, "utf-8");
                 }
               }
             }
@@ -199278,16 +199376,16 @@ EXPLANATION_END`;
           }
           try {
             const typeDir = type === "agent" ? "agents" : type === "team" ? "teams" : "skills";
-            const artDir = join26(homedir16(), ".markus", "builder-artifacts", typeDir, name);
+            const artDir = join27(homedir17(), ".markus", "builder-artifacts", typeDir, name);
             mkdirSync20(artDir, { recursive: true });
             for (const [fn, content] of Object.entries(files)) {
-              const filePath = join26(artDir, fn);
+              const filePath = join27(artDir, fn);
               mkdirSync20(dirname8(filePath), { recursive: true });
               writeFileSync18(filePath, content, "utf-8");
             }
             if (source) {
               const mfName = manifestFilename(type);
-              const mfPath = join26(artDir, mfName);
+              const mfPath = join27(artDir, mfName);
               if (existsSync30(mfPath)) {
                 try {
                   const mf = JSON.parse(readFileSync24(mfPath, "utf-8"));
@@ -199349,7 +199447,7 @@ EXPLANATION_END`;
               let removedTeamId;
               if (type === "agent") {
                 for (const agentInfo of agentManager.listAgents()) {
-                  const originPath = join26(dataDir, agentInfo.id, "role", ".role-origin.json");
+                  const originPath = join27(dataDir, agentInfo.id, "role", ".role-origin.json");
                   if (existsSync30(originPath)) {
                     try {
                       const origin = JSON.parse(readFileSync24(originPath, "utf-8"));
@@ -199365,7 +199463,7 @@ EXPLANATION_END`;
                 const teamAgentIds = [];
                 let teamId;
                 for (const agentInfo of agentManager.listAgents()) {
-                  const originPath = join26(dataDir, agentInfo.id, "role", ".role-origin.json");
+                  const originPath = join27(dataDir, agentInfo.id, "role", ".role-origin.json");
                   if (existsSync30(originPath)) {
                     try {
                       const origin = JSON.parse(readFileSync24(originPath, "utf-8"));
@@ -199402,7 +199500,7 @@ EXPLANATION_END`;
                 }
                 removedAgents.push(...teamAgentIds);
               } else if (type === "skill") {
-                const skillDir = join26(homedir16(), ".markus", "skills", name);
+                const skillDir = join27(homedir17(), ".markus", "skills", name);
                 if (existsSync30(skillDir)) {
                   rmSync3(skillDir, { recursive: true, force: true });
                   if (this.skillRegistry) {
@@ -199426,7 +199524,7 @@ EXPLANATION_END`;
             const rawType = delMatch[1];
             const name = decodeURIComponent(delMatch[2]);
             const typeDir = rawType.endsWith("s") ? rawType : rawType + "s";
-            const artDir = join26(homedir16(), ".markus", "builder-artifacts", typeDir, name);
+            const artDir = join27(homedir17(), ".markus", "builder-artifacts", typeDir, name);
             if (!existsSync30(artDir)) {
               this.json(res, 404, { error: "Artifact not found" });
               return;
@@ -199447,13 +199545,13 @@ EXPLANATION_END`;
             const name = decodeURIComponent(imgPostMatch[2]);
             const typeDir = rawType.endsWith("s") ? rawType : rawType + "s";
             const type = typeDir === "agents" ? "agent" : typeDir === "teams" ? "team" : "skill";
-            const artDir = join26(homedir16(), ".markus", "builder-artifacts", typeDir, name);
+            const artDir = join27(homedir17(), ".markus", "builder-artifacts", typeDir, name);
             if (!existsSync30(artDir)) {
               this.json(res, 404, { error: "Artifact not found" });
               return;
             }
             try {
-              const imagesDir = join26(artDir, "images");
+              const imagesDir = join27(artDir, "images");
               if (!existsSync30(imagesDir))
                 mkdirSync20(imagesDir, { recursive: true });
               const chunks = [];
@@ -199478,9 +199576,9 @@ EXPLANATION_END`;
                   if (headerEnd < 0)
                     continue;
                   const fileContent = part.slice(headerEnd + 4).replace(/\r\n$/, "").replace(/\r\n--$/, "");
-                  const filePath = join26(imagesDir, filename);
+                  const filePath = join27(imagesDir, filename);
                   writeFileSync18(filePath, Buffer.from(fileContent, "latin1"));
-                  const manifestFile = join26(artDir, `${type}.json`);
+                  const manifestFile = join27(artDir, `${type}.json`);
                   if (existsSync30(manifestFile)) {
                     try {
                       const manifest = JSON.parse(readFileSync24(manifestFile, "utf-8"));
@@ -199516,7 +199614,7 @@ EXPLANATION_END`;
             const name = decodeURIComponent(imgGetMatch[2]);
             const filename = decodeURIComponent(imgGetMatch[3]);
             const typeDir = rawType.endsWith("s") ? rawType : rawType + "s";
-            const filePath = join26(homedir16(), ".markus", "builder-artifacts", typeDir, name, "images", filename);
+            const filePath = join27(homedir17(), ".markus", "builder-artifacts", typeDir, name, "images", filename);
             if (!existsSync30(filePath)) {
               this.json(res, 404, { error: "Image not found" });
               return;
@@ -199536,15 +199634,15 @@ EXPLANATION_END`;
             const filename = decodeURIComponent(imgDelMatch[3]);
             const typeDir = rawType.endsWith("s") ? rawType : rawType + "s";
             const type = typeDir === "agents" ? "agent" : typeDir === "teams" ? "team" : "skill";
-            const artDir = join26(homedir16(), ".markus", "builder-artifacts", typeDir, name);
-            const filePath = join26(artDir, "images", filename);
+            const artDir = join27(homedir17(), ".markus", "builder-artifacts", typeDir, name);
+            const filePath = join27(artDir, "images", filename);
             if (!existsSync30(filePath)) {
               this.json(res, 404, { error: "Image not found" });
               return;
             }
             try {
               rmSync3(filePath);
-              const manifestFile = join26(artDir, `${type}.json`);
+              const manifestFile = join27(artDir, `${type}.json`);
               if (existsSync30(manifestFile)) {
                 try {
                   const manifest = JSON.parse(readFileSync24(manifestFile, "utf-8"));
@@ -200599,10 +200697,10 @@ EXPLANATION_END`;
           const body = await this.readBody(req);
           const authUser = await this.getAuthUser(req);
           const token = body["token"];
-          const tokenPath = join26(homedir16(), ".markus", "hub-token");
+          const tokenPath = join27(homedir17(), ".markus", "hub-token");
           try {
             if (token) {
-              mkdirSync20(join26(homedir16(), ".markus"), { recursive: true });
+              mkdirSync20(join27(homedir17(), ".markus"), { recursive: true });
               writeFileSync18(tokenPath, token, "utf-8");
             } else if (existsSync30(tokenPath)) {
               rmSync3(tokenPath);
@@ -201178,6 +201276,10 @@ EXPLANATION_END`;
             const { existsSync: ex, readFileSync: readFileSync34, statSync: statSync8 } = await import("node:fs");
             const thisDir = dn(fileURLToPath8(import.meta.url));
             const zipCandidates = [
+              // Electron desktop: zip is sibling of main.js in dist/ (unpacked from asar)
+              jn(thisDir, "markus-browser-extension.zip"),
+              // Also check MARKUS_TEMPLATES_DIR parent (points to unpacked dist/)
+              ...process.env.MARKUS_TEMPLATES_DIR ? [jn(rslv(process.env.MARKUS_TEMPLATES_DIR, ".."), "markus-browser-extension.zip")] : [],
               jn(rslv(thisDir, "..", "..", "chrome-extension"), "dist", "markus-browser-extension.zip"),
               jn(rslv(thisDir, "..", "chrome-extension"), "markus-browser-extension.zip"),
               jn(rslv(thisDir, "..", "..", "..", "chrome-extension"), "markus-browser-extension.zip"),
@@ -201222,11 +201324,11 @@ EXPLANATION_END`;
             return;
           try {
             const { exec: execCb2 } = await import("node:child_process");
-            const platform7 = process.platform;
-            if (platform7 === "darwin") {
+            const platform9 = process.platform;
+            if (platform9 === "darwin") {
               execCb2('open -a "Google Chrome" "chrome://extensions"', () => {
               });
-            } else if (platform7 === "win32") {
+            } else if (platform9 === "win32") {
               execCb2('start "" "chrome://extensions"', () => {
               });
             } else {
@@ -201497,6 +201599,10 @@ data: ${JSON.stringify({ error: msg })}
               });
             }
             this.invalidateRoutingCache();
+            if (!this.llmRouter.routingDefaultModel && enabled !== false) {
+              this.llmRouter.setRoutingDefaultModel({ provider: name, model });
+              log65.info("Auto-set routing default model for first provider", { provider: name, model });
+            }
             try {
               const { loadConfig: loadCfg } = await Promise.resolve().then(() => (init_dist(), dist_exports));
               const currentConfig = loadCfg(this.markusConfigPath);
@@ -201508,7 +201614,11 @@ data: ${JSON.stringify({ error: msg })}
                 ...baseUrl ? { baseUrl } : {},
                 enabled: enabled !== false
               };
-              saveConfig({ llm: { providers } }, this.markusConfigPath);
+              const configUpdates = { providers };
+              if (!currentConfig.llm.routingDefaultModel && enabled !== false) {
+                configUpdates.routingDefaultModel = { provider: name, model };
+              }
+              saveConfig({ llm: configUpdates }, this.markusConfigPath);
             } catch (e) {
               log65.warn("Failed to persist new provider", { error: String(e) });
             }
@@ -202064,6 +202174,14 @@ data: ${JSON.stringify({ error: msg })}
                 }
               }
               this.invalidateRoutingCache();
+              if (!this.llmRouter.routingDefaultModel && applied.length > 0) {
+                const first = providerUpdates.find((pu) => applied.includes(pu.provider));
+                if (first) {
+                  this.llmRouter.setRoutingDefaultModel({ provider: first.provider, model: first.model });
+                  saveConfig({ llm: { routingDefaultModel: { provider: first.provider, model: first.model } } }, this.markusConfigPath);
+                  log65.info("Auto-set routing default model from env detection", { provider: first.provider, model: first.model });
+                }
+              }
             }
             this.json(res, 200, {
               applied,
@@ -202863,11 +202981,11 @@ You can now:
           const { configPath, preview } = body;
           const { existsSync: fsExists, readFileSync: fsRead } = await import("node:fs");
           const { join: pathJoin } = await import("node:path");
-          const { homedir: homedir28 } = await import("node:os");
+          const { homedir: homedir29 } = await import("node:os");
           const possiblePaths = [
             configPath,
-            pathJoin(homedir28(), ".openclaw", "openclaw.json"),
-            pathJoin(homedir28(), ".openclaw", "openclaw.json5")
+            pathJoin(homedir29(), ".openclaw", "openclaw.json"),
+            pathJoin(homedir29(), ".openclaw", "openclaw.json5")
           ].filter(Boolean);
           let found = "";
           let rawContent = "";
@@ -203275,10 +203393,10 @@ You can now:
               this.json(res, 400, { error: "Invalid or non-existent path" });
               return;
             }
-            const platform7 = process.platform;
-            if (platform7 === "darwin")
+            const platform9 = process.platform;
+            if (platform9 === "darwin")
               execSync4(`open ${JSON.stringify(dirPath)}`);
-            else if (platform7 === "win32")
+            else if (platform9 === "win32")
               execSync4(`explorer ${JSON.stringify(dirPath)}`);
             else
               execSync4(`xdg-open ${JSON.stringify(dirPath)}`);
@@ -203359,7 +203477,7 @@ You can now:
         }
         if (path === "/api/system/storage" && req.method === "GET") {
           try {
-            const dataDir = join26(homedir16(), ".markus");
+            const dataDir = join27(homedir17(), ".markus");
             const result = this.collectStorageInfo(dataDir);
             this.json(res, 200, result);
           } catch (err) {
@@ -203431,8 +203549,8 @@ You can now:
           try {
             const { resolve: resolve21, extname: extname2 } = await import("node:path");
             const { existsSync: existsSync45, statSync: statSync8 } = await import("node:fs");
-            const { homedir: homedir28 } = await import("node:os");
-            const home = homedir28();
+            const { homedir: homedir29 } = await import("node:os");
+            const home = homedir29();
             const results = {};
             const mdExts = [".md", ".markdown"];
             const htmlExts = [".html", ".htm"];
@@ -203480,8 +203598,8 @@ You can now:
           try {
             const { resolve: resolve21, extname: extname2 } = await import("node:path");
             const { readFileSync: readFileSync34, existsSync: existsSync45, statSync: statSync8 } = await import("node:fs");
-            const { homedir: homedir28 } = await import("node:os");
-            const home = homedir28();
+            const { homedir: homedir29 } = await import("node:os");
+            const home = homedir29();
             const expanded = filePath.startsWith("~/") ? resolve21(home, filePath.slice(2)) : filePath === "~" ? home : filePath;
             const resolved = resolve21(expanded);
             if (!existsSync45(resolved)) {
@@ -203491,9 +203609,9 @@ You can now:
             const stat = statSync8(resolved);
             if (stat.isDirectory()) {
               const { readdirSync: readdirSync15 } = await import("node:fs");
-              const { join: join39, extname: extDir } = await import("node:path");
+              const { join: join40, extname: extDir } = await import("node:path");
               const entries2 = readdirSync15(resolved, { withFileTypes: true }).filter((e) => !e.name.startsWith(".")).map((e) => {
-                const full = join39(resolved, e.name);
+                const full = join40(resolved, e.name);
                 const isDir = e.isDirectory();
                 let size;
                 try {
@@ -203565,8 +203683,8 @@ You can now:
           try {
             const { resolve: resolve21, extname: extname2 } = await import("node:path");
             const { readFileSync: readFileSync34, existsSync: existsSync45, statSync: statSync8 } = await import("node:fs");
-            const { homedir: homedir28 } = await import("node:os");
-            const home = homedir28();
+            const { homedir: homedir29 } = await import("node:os");
+            const home = homedir29();
             const expanded = filePath.startsWith("~/") ? resolve21(home, filePath.slice(2)) : filePath === "~" ? home : filePath;
             const resolved = resolve21(expanded);
             if (!existsSync45(resolved) || !statSync8(resolved).isFile()) {
@@ -203617,8 +203735,8 @@ You can now:
             const { resolve: resolve21, dirname: dirname16 } = await import("node:path");
             const { existsSync: existsSync45, statSync: statSync8 } = await import("node:fs");
             const { exec: exec2 } = await import("node:child_process");
-            const { homedir: homedir28 } = await import("node:os");
-            const home = homedir28();
+            const { homedir: homedir29 } = await import("node:os");
+            const home = homedir29();
             const expanded = filePath.startsWith("~/") ? resolve21(home, filePath.slice(2)) : filePath === "~" ? home : filePath;
             const resolved = resolve21(expanded);
             if (!existsSync45(resolved)) {
@@ -203626,11 +203744,11 @@ You can now:
               return;
             }
             const isDir = statSync8(resolved).isDirectory();
-            const platform7 = process.platform;
+            const platform9 = process.platform;
             let cmd;
-            if (platform7 === "darwin") {
+            if (platform9 === "darwin") {
               cmd = isDir ? `open "${resolved}"` : `open -R "${resolved}"`;
-            } else if (platform7 === "win32") {
+            } else if (platform9 === "win32") {
               cmd = isDir ? `explorer "${resolved}"` : `explorer /select,"${resolved}"`;
             } else {
               cmd = `xdg-open "${isDir ? resolved : dirname16(resolved)}"`;
@@ -204292,12 +204410,12 @@ You can now:
         }
         if (this.webUiDir) {
           const safePath = path.replace(/\.\./g, "").replace(/\/\//g, "/");
-          const filePath = join26(this.webUiDir, safePath === "/" ? "index.html" : safePath);
+          const filePath = join27(this.webUiDir, safePath === "/" ? "index.html" : safePath);
           if (existsSync30(filePath) && statSync7(filePath).isFile()) {
             this.serveStaticFile(res, filePath, req);
             return;
           }
-          const indexPath = join26(this.webUiDir, "index.html");
+          const indexPath = join27(this.webUiDir, "index.html");
           if (existsSync30(indexPath) && !path.startsWith("/api/")) {
             this.serveStaticFile(res, indexPath, req);
             return;
@@ -204814,16 +204932,16 @@ You can now:
       }
       /** Resolve the role directory path for an agent. Uses roleId, normalized role name, or matching by display name. */
       resolveAgentRoleDir(agent) {
-        const agentDataDir = join26(this.orgService.getAgentManager().getDataDir(), agent.config.id);
-        const agentRoleDir = join26(agentDataDir, "role");
-        if (existsSync30(join26(agentRoleDir, "ROLE.md")))
+        const agentDataDir = join27(this.orgService.getAgentManager().getDataDir(), agent.config.id);
+        const agentRoleDir = join27(agentDataDir, "role");
+        if (existsSync30(join27(agentRoleDir, "ROLE.md")))
           return agentRoleDir;
-        const base = process.env["MARKUS_TEMPLATES_DIR"] ? join26(process.env["MARKUS_TEMPLATES_DIR"], "roles") : join26(process.cwd(), "templates", "roles");
+        const base = process.env["MARKUS_TEMPLATES_DIR"] ? join27(process.env["MARKUS_TEMPLATES_DIR"], "roles") : join27(process.cwd(), "templates", "roles");
         if (!existsSync30(base))
           return null;
         const tryDir = (dirName) => {
-          const p = join26(base, dirName, "ROLE.md");
-          return existsSync30(p) ? join26(base, dirName) : null;
+          const p = join27(base, dirName, "ROLE.md");
+          return existsSync30(p) ? join27(base, dirName) : null;
         };
         if (agent.config.roleId) {
           const d2 = tryDir(agent.config.roleId);
@@ -204837,7 +204955,7 @@ You can now:
         for (const entry of readdirSync11(base, { withFileTypes: true })) {
           if (!entry.isDirectory())
             continue;
-          const rolePath = join26(base, entry.name, "ROLE.md");
+          const rolePath = join27(base, entry.name, "ROLE.md");
           if (!existsSync30(rolePath))
             continue;
           try {
@@ -204845,7 +204963,7 @@ You can now:
             const match2 = content.match(/^#\s+(.+)$/m);
             const displayName = match2?.[1]?.trim();
             if (displayName && displayName.toLowerCase() === agent.role.name.toLowerCase()) {
-              return join26(base, entry.name);
+              return join27(base, entry.name);
             }
           } catch {
           }
@@ -204864,7 +204982,7 @@ You can now:
               return 0;
             let total = 0;
             for (const entry of readdirSync11(p, { withFileTypes: true })) {
-              total += dirSize(join26(p, entry.name), maxDepth, depth + 1);
+              total += dirSize(join27(p, entry.name), maxDepth, depth + 1);
             }
             return total;
           } catch {
@@ -204872,14 +204990,14 @@ You can now:
           }
         };
         const topLevelItems = [
-          { name: "Database", path: join26(dataDir, "data.db"), size: 0, description: "SQLite database (tasks, agents, chat, etc.)" },
-          { name: "Agents", path: join26(dataDir, "agents"), size: 0, description: "Agent workspaces, memory, role files, sessions" },
-          { name: "Skills", path: join26(dataDir, "skills"), size: 0, description: "Installed skill packages" },
-          { name: "LLM Logs", path: join26(dataDir, "llm-logs"), size: 0, description: "Daily LLM request/response audit logs" },
-          { name: "Builder Artifacts", path: join26(dataDir, "builder-artifacts"), size: 0, description: "Agent, team, and skill build outputs" },
-          { name: "Teams", path: join26(dataDir, "teams"), size: 0, description: "Team announcements and norms" },
-          { name: "Shared", path: join26(dataDir, "shared"), size: 0, description: "Cross-agent shared files and task deliverables" },
-          { name: "Knowledge", path: join26(dataDir, "knowledge"), size: 0, description: "File-based knowledge base entries" }
+          { name: "Database", path: join27(dataDir, "data.db"), size: 0, description: "SQLite database (tasks, agents, chat, etc.)" },
+          { name: "Agents", path: join27(dataDir, "agents"), size: 0, description: "Agent workspaces, memory, role files, sessions" },
+          { name: "Skills", path: join27(dataDir, "skills"), size: 0, description: "Installed skill packages" },
+          { name: "LLM Logs", path: join27(dataDir, "llm-logs"), size: 0, description: "Daily LLM request/response audit logs" },
+          { name: "Builder Artifacts", path: join27(dataDir, "builder-artifacts"), size: 0, description: "Agent, team, and skill build outputs" },
+          { name: "Teams", path: join27(dataDir, "teams"), size: 0, description: "Team announcements and norms" },
+          { name: "Shared", path: join27(dataDir, "shared"), size: 0, description: "Cross-agent shared files and task deliverables" },
+          { name: "Knowledge", path: join27(dataDir, "knowledge"), size: 0, description: "File-based knowledge base entries" }
         ];
         for (const item of topLevelItems) {
           if (item.name === "Database") {
@@ -204896,14 +205014,14 @@ You can now:
             item.size = dirSize(item.path);
           }
         }
-        const agentsDir = join26(dataDir, "agents");
+        const agentsDir = join27(dataDir, "agents");
         const agentInfos = [];
         const am = this.orgService.getAgentManager();
         if (existsSync30(agentsDir)) {
           for (const entry of readdirSync11(agentsDir, { withFileTypes: true })) {
             if (!entry.isDirectory() || entry.name === "vector-store")
               continue;
-            const agentDir = join26(agentsDir, entry.name);
+            const agentDir = join27(agentsDir, entry.name);
             const agent = (() => {
               try {
                 return am.getAgent(entry.name);
@@ -204912,11 +205030,11 @@ You can now:
               }
             })();
             const subItems = [
-              { name: "workspace", size: dirSize(join26(agentDir, "workspace")) },
-              { name: "memory", size: dirSize(join26(agentDir, "sessions")) + (existsSync30(join26(agentDir, "memories.json")) ? statSync7(join26(agentDir, "memories.json")).size : 0) + (existsSync30(join26(agentDir, "MEMORY.md")) ? statSync7(join26(agentDir, "MEMORY.md")).size : 0) },
-              { name: "role", size: dirSize(join26(agentDir, "role")) },
-              { name: "tool-outputs", size: dirSize(join26(agentDir, "tool-outputs")) },
-              { name: "daily-logs", size: dirSize(join26(agentDir, "daily-logs")) }
+              { name: "workspace", size: dirSize(join27(agentDir, "workspace")) },
+              { name: "memory", size: dirSize(join27(agentDir, "sessions")) + (existsSync30(join27(agentDir, "memories.json")) ? statSync7(join27(agentDir, "memories.json")).size : 0) + (existsSync30(join27(agentDir, "MEMORY.md")) ? statSync7(join27(agentDir, "MEMORY.md")).size : 0) },
+              { name: "role", size: dirSize(join27(agentDir, "role")) },
+              { name: "tool-outputs", size: dirSize(join27(agentDir, "tool-outputs")) },
+              { name: "daily-logs", size: dirSize(join27(agentDir, "daily-logs")) }
             ];
             agentInfos.push({
               id: entry.name,
@@ -204938,7 +205056,7 @@ You can now:
         };
       }
       detectOrphans() {
-        const dataDir = join26(homedir16(), ".markus");
+        const dataDir = join27(homedir17(), ".markus");
         const am = this.orgService.getAgentManager();
         const knownAgentIds = new Set(am.listAgents().map((a) => a.id));
         const teams = this.orgService.listTeams("default");
@@ -204956,31 +205074,31 @@ You can now:
               return 0;
             let total = 0;
             for (const entry of readdirSync11(p, { withFileTypes: true })) {
-              total += dirSize(join26(p, entry.name), maxDepth, depth + 1);
+              total += dirSize(join27(p, entry.name), maxDepth, depth + 1);
             }
             return total;
           } catch {
             return 0;
           }
         };
-        const agentsDir = join26(dataDir, "agents");
+        const agentsDir = join27(dataDir, "agents");
         if (existsSync30(agentsDir)) {
           for (const entry of readdirSync11(agentsDir, { withFileTypes: true })) {
             if (!entry.isDirectory() || entry.name === "vector-store")
               continue;
             if (!knownAgentIds.has(entry.name)) {
-              const p = join26(agentsDir, entry.name);
+              const p = join27(agentsDir, entry.name);
               orphanAgents.push({ id: entry.name, path: p, size: dirSize(p) });
             }
           }
         }
-        const teamsDir = join26(dataDir, "teams");
+        const teamsDir = join27(dataDir, "teams");
         if (existsSync30(teamsDir)) {
           for (const entry of readdirSync11(teamsDir, { withFileTypes: true })) {
             if (!entry.isDirectory())
               continue;
             if (!knownTeamIds.has(entry.name)) {
-              const p = join26(teamsDir, entry.name);
+              const p = join27(teamsDir, entry.name);
               orphanTeams.push({ id: entry.name, path: p, size: dirSize(p) });
             }
           }
@@ -205908,8 +206026,8 @@ var init_billing_service = __esm({
 
 // ../org-manager/dist/license-service.js
 import { readFileSync as readFileSync25, writeFileSync as writeFileSync19, existsSync as existsSync31, mkdirSync as mkdirSync21 } from "node:fs";
-import { join as join27, dirname as dirname9 } from "node:path";
-import { homedir as homedir17 } from "node:os";
+import { join as join28, dirname as dirname9 } from "node:path";
+import { homedir as homedir18 } from "node:os";
 import { randomUUID, createVerify } from "node:crypto";
 async function hubFetch(url, init, maxRedirects = 3) {
   let currentUrl = url;
@@ -205932,7 +206050,7 @@ var init_license_service = __esm({
     "use strict";
     init_dist();
     log68 = createLogger("license");
-    LICENSE_FILE = join27(homedir17(), ".markus", "license.json");
+    LICENSE_FILE = join28(homedir18(), ".markus", "license.json");
     HEARTBEAT_INTERVAL_MS = 4 * 60 * 60 * 1e3;
     HUB_LICENSE_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
 MCowBQYDK2VwAyEAPlaceholderPublicKeyForOfflineLicenseVerification00=
@@ -206048,7 +206166,7 @@ MCowBQYDK2VwAyEAPlaceholderPublicKeyForOfflineLicenseVerification00=
       }
       readHubToken() {
         try {
-          const tokenPath = join27(homedir17(), ".markus", "hub-token");
+          const tokenPath = join28(homedir18(), ".markus", "hub-token");
           return existsSync31(tokenPath) ? readFileSync25(tokenPath, "utf-8").trim() : void 0;
         } catch {
           return void 0;
@@ -206299,8 +206417,8 @@ MCowBQYDK2VwAyEAPlaceholderPublicKeyForOfflineLicenseVerification00=
 
 // ../org-manager/dist/telemetry-service.js
 import { readFileSync as readFileSync26, writeFileSync as writeFileSync20, existsSync as existsSync32, mkdirSync as mkdirSync22 } from "node:fs";
-import { join as join28, dirname as dirname10 } from "node:path";
-import { homedir as homedir18, platform as platform4, arch as arch2 } from "node:os";
+import { join as join29, dirname as dirname10 } from "node:path";
+import { homedir as homedir19, platform as platform6, arch as arch2 } from "node:os";
 async function hubFetch2(url, init) {
   let currentUrl = url;
   for (let i = 0; i < 3; i++) {
@@ -206322,7 +206440,7 @@ var init_telemetry_service = __esm({
     "use strict";
     init_dist();
     log69 = createLogger("telemetry");
-    TELEMETRY_CONFIG_FILE = join28(homedir18(), ".markus", "telemetry.json");
+    TELEMETRY_CONFIG_FILE = join29(homedir19(), ".markus", "telemetry.json");
     REPORT_INTERVAL_MS = 6 * 60 * 60 * 1e3;
     TelemetryService = class {
       enabled;
@@ -206379,7 +206497,7 @@ var init_telemetry_service = __esm({
           const payload = {
             instanceId: this.instanceId,
             version: APP_VERSION,
-            os: `${platform4()}/${arch2()}`,
+            os: `${platform6()}/${arch2()}`,
             ...stats
           };
           const hubToken = this.readHubToken();
@@ -206400,7 +206518,7 @@ var init_telemetry_service = __esm({
       }
       readHubToken() {
         try {
-          const tokenPath = join28(homedir18(), ".markus", "hub-token");
+          const tokenPath = join29(homedir19(), ".markus", "hub-token");
           return existsSync32(tokenPath) ? readFileSync26(tokenPath, "utf-8").trim() : void 0;
         } catch {
           return void 0;
@@ -207540,7 +207658,7 @@ var init_knowledge_service = __esm({
 
 // ../org-manager/dist/file-knowledge-store.js
 import { readFileSync as readFileSync27, writeFileSync as writeFileSync21, existsSync as existsSync33, mkdirSync as mkdirSync23, readdirSync as readdirSync12, unlinkSync as unlinkSync4 } from "node:fs";
-import { join as join29 } from "node:path";
+import { join as join30 } from "node:path";
 function readdirSafe(dir) {
   try {
     return readdirSync12(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
@@ -207561,13 +207679,13 @@ var init_file_knowledge_store = __esm({
         mkdirSync23(baseDir, { recursive: true });
       }
       scopeDir(scope, scopeId) {
-        return join29(this.baseDir, scope, scopeId);
+        return join30(this.baseDir, scope, scopeId);
       }
       indexPath(scope, scopeId) {
-        return join29(this.scopeDir(scope, scopeId), "_index.json");
+        return join30(this.scopeDir(scope, scopeId), "_index.json");
       }
       entryPath(entry) {
-        return join29(this.scopeDir(entry.scope, entry.scopeId), `${entry.id}.json`);
+        return join30(this.scopeDir(entry.scope, entry.scopeId), `${entry.id}.json`);
       }
       // ─── Load ────────────────────────────────────────────────────────────────
       loadAll() {
@@ -207575,9 +207693,9 @@ var init_file_knowledge_store = __esm({
         if (!existsSync33(this.baseDir))
           return entries2;
         for (const scope of readdirSafe(this.baseDir)) {
-          const scopePath = join29(this.baseDir, scope);
+          const scopePath = join30(this.baseDir, scope);
           for (const scopeId of readdirSafe(scopePath)) {
-            const idxPath = join29(scopePath, scopeId, "_index.json");
+            const idxPath = join30(scopePath, scopeId, "_index.json");
             if (!existsSync33(idxPath))
               continue;
             try {
@@ -207595,15 +207713,15 @@ var init_file_knowledge_store = __esm({
       saveEntry(entry) {
         const dir = this.scopeDir(entry.scope, entry.scopeId);
         mkdirSync23(dir, { recursive: true });
-        writeFileSync21(join29(dir, `${entry.id}.json`), JSON.stringify(entry, null, 2));
+        writeFileSync21(join30(dir, `${entry.id}.json`), JSON.stringify(entry, null, 2));
       }
       saveIndex(scope, scopeId, entries2) {
         const dir = this.scopeDir(scope, scopeId);
         mkdirSync23(dir, { recursive: true });
-        writeFileSync21(join29(dir, "_index.json"), JSON.stringify(entries2, null, 2));
+        writeFileSync21(join30(dir, "_index.json"), JSON.stringify(entries2, null, 2));
       }
       removeEntryFile(entry) {
-        const p = join29(this.scopeDir(entry.scope, entry.scopeId), `${entry.id}.json`);
+        const p = join30(this.scopeDir(entry.scope, entry.scopeId), `${entry.id}.json`);
         try {
           unlinkSync4(p);
         } catch {
@@ -207627,7 +207745,7 @@ var init_file_knowledge_store = __esm({
 
 // ../org-manager/dist/deliverable-service.js
 import { existsSync as existsSync34, cpSync as cpSync3, mkdirSync as mkdirSync24 } from "node:fs";
-import { join as join30, basename as basename2 } from "node:path";
+import { join as join31, basename as basename2 } from "node:path";
 function isUrl(s2) {
   return /^https?:\/\//i.test(s2);
 }
@@ -207964,7 +208082,7 @@ var init_deliverable_service = __esm({
         const deliverables = this.findByAgent(agentId2);
         if (deliverables.length === 0)
           return 0;
-        const sharedDeliverables = join30(sharedDataDir, "deliverables");
+        const sharedDeliverables = join31(sharedDataDir, "deliverables");
         let migrated = 0;
         for (const d of deliverables) {
           if (!d.reference || isUrl(d.reference))
@@ -207974,10 +208092,10 @@ var init_deliverable_service = __esm({
           if (!existsSync34(d.reference))
             continue;
           try {
-            const destDir = join30(sharedDeliverables, d.id);
+            const destDir = join31(sharedDeliverables, d.id);
             mkdirSync24(destDir, { recursive: true });
             const fileName = basename2(d.reference);
-            const destPath = join30(destDir, fileName);
+            const destPath = join31(destDir, fileName);
             cpSync3(d.reference, destPath, { recursive: true });
             await this.update(d.id, { reference: destPath });
             migrated++;
@@ -208008,56 +208126,23 @@ var init_deliverable_service = __esm({
         return missing;
       }
       /**
-       * One-time migration: scan existing tasks and create Deliverable entries
-       * for any task.deliverables that don't yet have a corresponding row.
-       * Also cleans up any legacy "branch"-type deliverables by marking them outdated.
+       * Clean up legacy migration markers and branch-type deliverables from the table.
+       * Safe to call on startup — removes only housekeeping rows.
        */
-      async migrateFromTasks(tasks) {
-        let branchCleaned = 0;
+      async cleanupLegacyRows() {
+        let cleaned = 0;
         for (const [id, d] of this.cache) {
-          if (d.type === "branch" && d.status !== "outdated") {
-            d.status = "outdated";
-            d.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-            await this.repo?.update(id, { status: "outdated" });
-            branchCleaned++;
-          }
-        }
-        if (branchCleaned > 0) {
-          log75.info("Cleaned up legacy branch-type deliverables", { count: branchCleaned });
-        }
-        const existingTaskIds = this.repo ? await this.repo.listTaskIdsWithDeliverables() : new Set([...this.cache.values()].map((d) => d.taskId).filter(Boolean));
-        let migrated = 0;
-        for (const task of tasks) {
-          if (!task.deliverables?.length)
-            continue;
-          if (existingTaskIds.has(task.id))
-            continue;
-          for (const d of task.deliverables) {
-            if (d.type === "branch")
-              continue;
-            try {
-              await this.create({
-                type: this.mapTaskDeliverableType(d.type),
-                title: d.summary?.slice(0, 200) || d.reference,
-                summary: d.summary || "",
-                reference: d.reference,
-                taskId: task.id,
-                agentId: task.assignedAgentId,
-                projectId: task.projectId,
-                requirementId: task.requirementId,
-                diffStats: d.diffStats,
-                testResults: d.testResults
-              });
-              migrated++;
-            } catch (err) {
-              log75.warn("Failed to migrate task deliverable", { taskId: task.id, ref: d.reference, error: String(err) });
-            }
+          const isMigrationMarker = d.title === "[migration-processed]" && d.status === "outdated";
+          const isBranchType = d.type === "branch";
+          if (isMigrationMarker || isBranchType) {
+            this.cache.delete(id);
+            await this.repo?.delete(id);
+            cleaned++;
           }
         }
-        if (migrated > 0) {
-          log75.info("Migrated task deliverables to unified table", { migrated });
+        if (cleaned > 0) {
+          log75.info("Cleaned up legacy deliverable rows", { count: cleaned });
         }
-        return migrated;
       }
       parseTags(raw) {
         if (Array.isArray(raw))
@@ -208074,14 +208159,6 @@ var init_deliverable_service = __esm({
         }
         return [];
       }
-      mapTaskDeliverableType(type) {
-        switch (type) {
-          case "file":
-            return "file";
-          default:
-            return "file";
-        }
-      }
       rowToDeliverable(r) {
         return {
           id: r.id,
@@ -208871,7 +208948,8 @@ function openSqlite(dbPath) {
     { table: "agents", column: "disabled", sql: "ALTER TABLE agents ADD COLUMN disabled INTEGER NOT NULL DEFAULT 0" },
     { table: "deliverables", column: "format", sql: "ALTER TABLE deliverables ADD COLUMN format TEXT" },
     { table: "task_comments", column: "reply_to_id", sql: "ALTER TABLE task_comments ADD COLUMN reply_to_id TEXT" },
-    { table: "requirement_comments", column: "reply_to_id", sql: "ALTER TABLE requirement_comments ADD COLUMN reply_to_id TEXT" }
+    { table: "requirement_comments", column: "reply_to_id", sql: "ALTER TABLE requirement_comments ADD COLUMN reply_to_id TEXT" },
+    { table: "tasks", column: "completion_summary", sql: "ALTER TABLE tasks ADD COLUMN completion_summary TEXT" }
   ];
   for (const m of migrations) {
     const cols = _db.prepare(`PRAGMA table_info(${m.table})`).all();
@@ -209819,6 +209897,9 @@ CREATE INDEX IF NOT EXISTS idx_integrations_org ON integrations(org_id, platform
       async updateDeliverables(id, deliverables) {
         this.db.prepare("UPDATE tasks SET deliverables = ?, updated_at = ? WHERE id = ?").run(toJson(deliverables), now2(), id);
       }
+      async updateCompletionSummary(id, summary) {
+        this.db.prepare("UPDATE tasks SET completion_summary = ?, updated_at = ? WHERE id = ?").run(summary, now2(), id);
+      }
       listByOrg(orgId2, filters2) {
         let q = "SELECT * FROM tasks WHERE org_id = ?";
         const vals = [orgId2];
@@ -209890,6 +209971,7 @@ CREATE INDEX IF NOT EXISTS idx_integrations_org ON integrations(org_id, platform
           completedAt: toDate(r["completed_at"]),
           taskType: r["task_type"] ?? "standard",
           scheduleConfig: fromJson(r["schedule_config"]),
+          completionSummary: r["completion_summary"] ?? void 0,
           createdAt: toDate(r["created_at"]),
           updatedAt: toDate(r["updated_at"]),
           dueAt: toDate(r["due_at"])
@@ -211419,6 +211501,9 @@ CREATE INDEX IF NOT EXISTS idx_integrations_org ON integrations(org_id, platform
       async remove(id) {
         this.db.prepare("UPDATE deliverables SET status = 'outdated', updated_at = ? WHERE id = ?").run(now2(), id);
       }
+      async delete(id) {
+        this.db.prepare("DELETE FROM deliverables WHERE id = ?").run(id);
+      }
       async listAll(limit = 500) {
         const rows = this.db.prepare("SELECT * FROM deliverables WHERE status != 'outdated' ORDER BY updated_at DESC LIMIT ?").all(limit);
         return rows.map((r) => this.mapRow(r));
@@ -212078,8 +212163,8 @@ CREATE INDEX IF NOT EXISTS idx_integrations_org ON integrations(org_id, platform
         const rows = this.db.prepare("SELECT * FROM integrations WHERE org_id = ? ORDER BY platform, display_name").all(orgId2);
         return rows.map((r) => this.mapRow(r));
       }
-      listByPlatform(orgId2, platform7) {
-        const rows = this.db.prepare("SELECT * FROM integrations WHERE org_id = ? AND platform = ? ORDER BY display_name").all(orgId2, platform7);
+      listByPlatform(orgId2, platform9) {
+        const rows = this.db.prepare("SELECT * FROM integrations WHERE org_id = ? AND platform = ? ORDER BY display_name").all(orgId2, platform9);
         return rows.map((r) => this.mapRow(r));
       }
       async update(id, data) {
@@ -212350,17 +212435,17 @@ var init_dist5 = __esm({
 });
 
 // ../org-manager/dist/storage-bridge.js
-import { homedir as homedir19 } from "node:os";
-import { join as join31 } from "node:path";
+import { homedir as homedir20 } from "node:os";
+import { join as join32 } from "node:path";
 function resolveSqlitePath(url) {
   if (url?.startsWith("sqlite:")) {
     let p = url.slice("sqlite:".length);
     if (p.startsWith("~/") || p === "~") {
-      p = join31(homedir19(), p.slice(2));
+      p = join32(homedir20(), p.slice(2));
     }
     return p;
   }
-  return join31(homedir19(), ".markus", "data.db");
+  return join32(homedir20(), ".markus", "data.db");
 }
 async function initStorage(databaseUrl) {
   const url = databaseUrl ?? process.env["DATABASE_URL"];
@@ -212422,8 +212507,8 @@ var init_storage_bridge = __esm({
 
 // ../org-manager/dist/file-storage-provider.js
 import { mkdirSync as mkdirSync26, writeFileSync as writeFileSync22, unlinkSync as unlinkSync5, existsSync as existsSync35 } from "node:fs";
-import { join as join32, extname } from "node:path";
-import { homedir as homedir20 } from "node:os";
+import { join as join33, extname } from "node:path";
+import { homedir as homedir21 } from "node:os";
 function mimeToExt(mime) {
   const map = {
     "image/jpeg": ".jpg",
@@ -212443,27 +212528,27 @@ var init_file_storage_provider = __esm({
     LocalFileStorageProvider = class {
       baseDir;
       constructor(baseDir) {
-        this.baseDir = baseDir ?? join32(homedir20(), ".markus", "uploads");
+        this.baseDir = baseDir ?? join33(homedir21(), ".markus", "uploads");
         mkdirSync26(this.baseDir, { recursive: true });
       }
       async upload(data, opts) {
         const ext = extname(opts.name) || mimeToExt(opts.contentType);
         const key2 = `${generateId("upl")}${ext}`;
-        const subDir = opts.prefix ? join32(this.baseDir, opts.prefix) : this.baseDir;
+        const subDir = opts.prefix ? join33(this.baseDir, opts.prefix) : this.baseDir;
         mkdirSync26(subDir, { recursive: true });
-        writeFileSync22(join32(subDir, key2), data);
+        writeFileSync22(join33(subDir, key2), data);
         const urlPath = opts.prefix ? `/api/uploads/${opts.prefix}/${key2}` : `/api/uploads/${key2}`;
         return { url: urlPath, key: opts.prefix ? `${opts.prefix}/${key2}` : key2 };
       }
       async delete(key2) {
-        const filePath = join32(this.baseDir, key2);
+        const filePath = join33(this.baseDir, key2);
         if (existsSync35(filePath)) {
           unlinkSync5(filePath);
         }
       }
       /** Resolve a storage key to an absolute filesystem path (for serving). */
       resolve(key2) {
-        return join32(this.baseDir, key2);
+        return join33(this.baseDir, key2);
       }
     };
   }
@@ -219798,8 +219883,8 @@ var require_dist2 = __commonJS({
 
 // ../org-manager/dist/workflow-service.js
 import { existsSync as existsSync36, mkdirSync as mkdirSync27, readdirSync as readdirSync13, readFileSync as readFileSync28, writeFileSync as writeFileSync23, unlinkSync as unlinkSync6 } from "node:fs";
-import { join as join33 } from "node:path";
-import { homedir as homedir21 } from "node:os";
+import { join as join34 } from "node:path";
+import { homedir as homedir22 } from "node:os";
 var import_yaml, log83, WorkflowService;
 var init_workflow_service = __esm({
   "../org-manager/dist/workflow-service.js"() {
@@ -219813,7 +219898,7 @@ var init_workflow_service = __esm({
         this.orgService = orgService;
       }
       getWorkflowsDir(teamId) {
-        return join33(homedir21(), ".markus", "teams", teamId, "workflows");
+        return join34(homedir22(), ".markus", "teams", teamId, "workflows");
       }
       ensureWorkflowsDir(teamId) {
         const dir = this.getWorkflowsDir(teamId);
@@ -219828,7 +219913,7 @@ var init_workflow_service = __esm({
         const result = [];
         for (const file of files) {
           try {
-            const template = this.parseTemplateFile(join33(dir, file));
+            const template = this.parseTemplateFile(join34(dir, file));
             result.push({
               name: template.name,
               displayName: template.displayName || template.name,
@@ -219867,7 +219952,7 @@ var init_workflow_service = __esm({
         const template = parsed;
         const dir = this.ensureWorkflowsDir(teamId);
         const fileName = `${name}.yaml`;
-        const filePath = join33(dir, fileName);
+        const filePath = join34(dir, fileName);
         if (existsSync36(filePath)) {
           throw new Error(`Workflow "${name}" already exists. Use updateWorkflow to modify it.`);
         }
@@ -220012,19 +220097,19 @@ var init_workflow_service = __esm({
       resolveWorkflowFile(dir, name) {
         if (!existsSync36(dir))
           return null;
-        const yamlPath = join33(dir, `${name}.yaml`);
+        const yamlPath = join34(dir, `${name}.yaml`);
         if (existsSync36(yamlPath))
           return yamlPath;
-        const ymlPath = join33(dir, `${name}.yml`);
+        const ymlPath = join34(dir, `${name}.yml`);
         if (existsSync36(ymlPath))
           return ymlPath;
         const files = readdirSync13(dir).filter((f) => f.endsWith(".yaml") || f.endsWith(".yml"));
         for (const file of files) {
           try {
-            const content = readFileSync28(join33(dir, file), "utf-8");
+            const content = readFileSync28(join34(dir, file), "utf-8");
             const parsed = (0, import_yaml.parse)(content);
             if (parsed.name === name)
-              return join33(dir, file);
+              return join34(dir, file);
           } catch {
           }
         }
@@ -221706,8 +221791,8 @@ var init_router2 = __esm({
         this.adapters.set(adapter2.platform, adapter2);
         log95.info(`Registered comm adapter: ${adapter2.platform}`);
       }
-      bindAgentToChannel(agentId2, platform7, channelId) {
-        const key2 = `${platform7}:${channelId}`;
+      bindAgentToChannel(agentId2, platform9, channelId) {
+        const key2 = `${platform9}:${channelId}`;
         this.agentChannelMap.set(key2, agentId2);
         log95.info(`Bound agent ${agentId2} to ${key2}`);
       }
@@ -221738,16 +221823,16 @@ var init_router2 = __esm({
           }
         }
       }
-      async sendToChannel(platform7, channelId, content) {
-        const adapter2 = this.adapters.get(platform7);
+      async sendToChannel(platform9, channelId, content) {
+        const adapter2 = this.adapters.get(platform9);
         if (!adapter2 || !adapter2.isConnected()) {
-          log95.warn(`Adapter not available for platform: ${platform7}`);
+          log95.warn(`Adapter not available for platform: ${platform9}`);
           return void 0;
         }
         return adapter2.sendMessage(channelId, content);
       }
-      async sendAsAgent(agentId2, platform7, channelId, content) {
-        return this.sendToChannel(platform7, channelId, content);
+      async sendAsAgent(agentId2, platform9, channelId, content) {
+        return this.sendToChannel(platform9, channelId, content);
       }
       async routeIncomingMessage(message) {
         const key2 = `${message.platform}:${message.channelId}`;
@@ -221797,8 +221882,8 @@ var init_dist7 = __esm({
 
 // src/utils/logger.ts
 import { createWriteStream as createWriteStream2, existsSync as existsSync37, mkdirSync as mkdirSync28, appendFileSync as appendFileSync3 } from "node:fs";
-import { join as join34 } from "node:path";
-import { homedir as homedir22 } from "node:os";
+import { join as join35 } from "node:path";
+import { homedir as homedir23 } from "node:os";
 function ensureLogDir2() {
   if (!existsSync37(LOG_DIR2)) {
     mkdirSync28(LOG_DIR2, { recursive: true, mode: 493 });
@@ -221806,7 +221891,7 @@ function ensureLogDir2() {
 }
 function getStartupLogPath() {
   const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-  return join34(LOG_DIR2, `startup-${date}.log`);
+  return join35(LOG_DIR2, `startup-${date}.log`);
 }
 function setSuppressConsole(suppress) {
   _suppressConsole = suppress;
@@ -221861,7 +221946,7 @@ var LOG_DIR2, startupLogStream, startupLogPath, _suppressConsole, LEVEL_PREFIX;
 var init_logger2 = __esm({
   "src/utils/logger.ts"() {
     "use strict";
-    LOG_DIR2 = join34(homedir22(), ".markus", "logs");
+    LOG_DIR2 = join35(homedir23(), ".markus", "logs");
     startupLogStream = null;
     startupLogPath = "";
     _suppressConsole = false;
@@ -221879,10 +221964,10 @@ var init_logger2 = __esm({
 // src/utils/browser.ts
 import { exec } from "node:child_process";
 import { get as httpGet } from "node:http";
-import { platform as platform5 } from "node:os";
+import { platform as platform7 } from "node:os";
 function openBrowser(url) {
   if (process.env["NO_BROWSER"]) return;
-  const sys = platform5();
+  const sys = platform7();
   const cmd = sys === "darwin" ? `open "${url}"` : sys === "win32" ? `start "" "${url}"` : `xdg-open "${url}"`;
   exec(cmd, (err) => {
     if (err) {
@@ -221917,9 +222002,9 @@ var init_browser = __esm({
 });
 
 // src/utils/startupProgress.ts
-import { homedir as homedir23 } from "node:os";
+import { homedir as homedir24 } from "node:os";
 import { appendFileSync as appendFileSync4, existsSync as existsSync38, mkdirSync as mkdirSync29 } from "node:fs";
-import { join as join35 } from "node:path";
+import { join as join36 } from "node:path";
 function clearScreen() {
   return "\x1B[2J\x1B[H";
 }
@@ -222081,7 +222166,7 @@ var init_startupProgress = __esm({
         const line = `${ts} ${msg}
 `;
         try {
-          const dir = join35(homedir23(), ".markus", "logs");
+          const dir = join36(homedir24(), ".markus", "logs");
           if (!existsSync38(dir)) mkdirSync29(dir, { recursive: true, mode: 493 });
           appendFileSync4(this.logPath, line, { mode: 420 });
         } catch {
@@ -222191,13 +222276,13 @@ var init_startupProgress = __esm({
 });
 
 // src/connector-service.ts
-import { resolve as resolve16, join as join36, dirname as dirname12 } from "node:path";
+import { resolve as resolve16, join as join37, dirname as dirname12 } from "node:path";
 import { existsSync as existsSync39, readFileSync as readFileSync29, writeFileSync as writeFileSync24, mkdirSync as mkdirSync30, readdirSync as readdirSync14, cpSync as cpSync4 } from "node:fs";
-import { homedir as homedir24 } from "node:os";
+import { homedir as homedir25 } from "node:os";
 import { execSync as execSync5 } from "node:child_process";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 function expandHome(p) {
-  return p.replace(/^~/, homedir24());
+  return p.replace(/^~/, homedir25());
 }
 function loadConnectors() {
   const connectors = /* @__PURE__ */ new Map();
@@ -222205,7 +222290,7 @@ function loadConnectors() {
   loadFromDir(builtinDir, connectors);
   const devDir = resolve16(process.cwd(), "packages", "cli", "connectors");
   if (devDir !== builtinDir) loadFromDir(devDir, connectors);
-  const userDir = join36(homedir24(), ".markus", "connectors");
+  const userDir = join37(homedir25(), ".markus", "connectors");
   loadFromDir(userDir, connectors);
   return [...connectors.values()].filter((c) => c.platform !== "_template");
 }
@@ -222214,7 +222299,7 @@ function loadFromDir(dir, map) {
   for (const file of readdirSync14(dir)) {
     if (!file.endsWith(".json") || file.startsWith("_")) continue;
     try {
-      const raw = readFileSync29(join36(dir, file), "utf-8");
+      const raw = readFileSync29(join37(dir, file), "utf-8");
       const desc = JSON.parse(raw);
       if (desc.platform) {
         map.set(desc.platform, desc);
@@ -222223,8 +222308,8 @@ function loadFromDir(dir, map) {
     }
   }
 }
-function findConnector(platform7) {
-  return loadConnectors().find((c) => c.platform === platform7);
+function findConnector(platform9) {
+  return loadConnectors().find((c) => c.platform === platform9);
 }
 function scanInstalledPlatforms() {
   const connectors = loadConnectors();
@@ -222308,7 +222393,7 @@ function installSkillTemplate(connector) {
   const envDir = process.env["MARKUS_TEMPLATES_DIR"];
   const candidates = [
     ...envDir ? [resolve16(envDir, templateName)] : [],
-    join36(homedir24(), ".markus", "templates", templateName),
+    join37(homedir25(), ".markus", "templates", templateName),
     resolve16(process.cwd(), "templates", templateName),
     resolve16(__dirname6, "..", "templates", templateName)
   ];
@@ -222320,7 +222405,7 @@ function installSkillTemplate(connector) {
     }
   }
   if (!sourceDir) return false;
-  const targetDir = join36(skillDir, templateName);
+  const targetDir = join37(skillDir, templateName);
   if (!existsSync39(targetDir)) {
     mkdirSync30(targetDir, { recursive: true });
   }
@@ -222376,7 +222461,7 @@ __export(init_exports, {
 });
 import { resolve as resolve17 } from "node:path";
 import { readFileSync as readFileSync30, existsSync as existsSync40, cpSync as cpSync5 } from "node:fs";
-import { homedir as homedir25 } from "node:os";
+import { homedir as homedir26 } from "node:os";
 function registerInitCommand(program2) {
   program2.command("init").description("Setup wizard: configure LLM provider, API keys, and server settings").option("--force", "Overwrite existing configuration").option("--non-interactive", "Run without prompts (use env vars or --import-from)").option("--provider <name>", "LLM provider (anthropic/openai/google/minimax/siliconflow/zai/deepseek/ollama)").option("--api-key <key>", "LLM API key").option("--port <port>", "API server port", "8056").option("--import-from <platform>", "Import LLM config from an installed agent platform (e.g. openclaw, hermes)").option("--auto-connect", "Auto-connect detected agent platforms after init").action(async (opts) => {
     await quickInit({
@@ -222445,8 +222530,8 @@ async function quickInit(options) {
   const installedPlatforms = scanInstalledPlatforms().filter((p) => p.installed);
   let openclawPath = "";
   const openclawCandidates = [
-    pathJoin(homedir25(), ".openclaw", "openclaw.json"),
-    pathJoin(homedir25(), ".openclaw", "openclaw.json5")
+    pathJoin(homedir26(), ".openclaw", "openclaw.json"),
+    pathJoin(homedir26(), ".openclaw", "openclaw.json5")
   ];
   for (const p of openclawCandidates) {
     if (existsSync40(p)) {
@@ -222651,7 +222736,7 @@ async function quickInit(options) {
     console.error(`
   Failed to save config: ${e}`);
   }
-  const userTemplatesDir = pathJoin(homedir25(), ".markus", "templates");
+  const userTemplatesDir = pathJoin(homedir26(), ".markus", "templates");
   const builtinTemplatesDir = resolveTemplatesDir("roles");
   if (builtinTemplatesDir && existsSync40(builtinTemplatesDir) && !existsSync40(userTemplatesDir)) {
     const builtinRoot = resolve17(builtinTemplatesDir, "..");
@@ -222704,7 +222789,7 @@ async function quickInit(options) {
     console.log("");
   }
   console.log(`  Config:  ${configPath}`);
-  console.log(`  Data:    ${pathJoin(homedir25(), ".markus")}`);
+  console.log(`  Data:    ${pathJoin(homedir26(), ".markus")}`);
   console.log(`  Server:  http://localhost:${apiPort}`);
   console.log("");
 }
@@ -223489,9 +223574,9 @@ __export(start_exports, {
   registerStartCommand: () => registerStartCommand,
   startServerHeadless: () => startServerHeadless
 });
-import { resolve as resolve18, join as join37, dirname as dirname13 } from "node:path";
+import { resolve as resolve18, join as join38, dirname as dirname13, delimiter } from "node:path";
 import { existsSync as existsSync41, readFileSync as readFileSync31 } from "node:fs";
-import { homedir as homedir26 } from "node:os";
+import { homedir as homedir27 } from "node:os";
 function registerStartCommand(program2) {
   program2.command("start").description("Start the Markus server (auto-initializes on first run)").option("--setup", "Force re-run the interactive setup wizard before starting").action(async (opts) => {
     const globalOpts = program2.optsWithGlobals();
@@ -223658,8 +223743,8 @@ async function createServices(config) {
     extraSkillDirs: skillDirs
   });
   const storage = await initStorage(config.database?.url);
-  const markusDataDir = join37(homedir26(), ".markus");
-  const sharedDataDir = join37(markusDataDir, "shared");
+  const markusDataDir = join38(homedir27(), ".markus");
+  const sharedDataDir = join38(markusDataDir, "shared");
   const taskService = new TaskService();
   taskService.setSharedDataDir(sharedDataDir);
   if (storage) {
@@ -223691,7 +223776,7 @@ async function createServices(config) {
   const agentManager = new AgentManager({
     llmRouter,
     roleLoader,
-    dataDir: join37(markusDataDir, "agents"),
+    dataDir: join38(markusDataDir, "agents"),
     sharedDataDir,
     skillRegistry,
     taskService,
@@ -223824,10 +223909,10 @@ async function startServerCore(config, values, opts) {
   const extraPaths = [];
   const selfBinDir = dirname13(resolve18(process.argv[1] ?? ""));
   if (selfBinDir && !currentPath.includes(selfBinDir)) extraPaths.push(selfBinDir);
-  const cwdBin = join37(process.cwd(), "node_modules", ".bin");
+  const cwdBin = join38(process.cwd(), "node_modules", ".bin");
   if (existsSync41(cwdBin) && !currentPath.includes(cwdBin)) extraPaths.push(cwdBin);
   if (extraPaths.length > 0) {
-    process.env["PATH"] = `${extraPaths.join(":")}:${currentPath}`;
+    process.env["PATH"] = `${extraPaths.join(delimiter)}${delimiter}${currentPath}`;
   }
   if (config.security?.adminPassword && !process.env["ADMIN_PASSWORD"]) {
     process.env["ADMIN_PASSWORD"] = config.security.adminPassword;
@@ -223895,13 +223980,12 @@ async function startServerCore(config, values, opts) {
     projectService.setProjectRepo(storage.projectRepo);
   }
   await projectService.loadFromDB("default");
-  const knowledgeStore = new FileKnowledgeStore(join37(homedir26(), ".markus", "knowledge"));
+  const knowledgeStore = new FileKnowledgeStore(join38(homedir27(), ".markus", "knowledge"));
   const knowledgeService = new KnowledgeService(knowledgeStore);
   const deliverableService = new DeliverableService(storage?.deliverableRepo);
   await deliverableService.load();
-  const allTasks = taskService.listTasks({ orgId: "default" });
-  await deliverableService.migrateFromTasks(allTasks);
-  await deliverableService.deduplicateByReference();
+  await taskService.migrateBranchToCompletionSummary();
+  await deliverableService.cleanupLegacyRows();
   const reportService = new ReportService(taskService, billingService, auditService, knowledgeService);
   const _trustService = new TrustService();
   const requirementService = new RequirementService();
@@ -224356,7 +224440,7 @@ ${reason}`;
   apiServer.setGateway(gateway, gatewaySecret);
   log97.info("External Agent Gateway enabled", { secret: gatewaySecret === "markus-gateway-default-secret-change-me" ? "(default)" : "(custom)" });
   {
-    const hubTokenPath = join37(homedir26(), ".markus", "hub-token");
+    const hubTokenPath = join38(homedir27(), ".markus", "hub-token");
     const createRemoteAgent = async () => {
       const token = existsSync41(hubTokenPath) ? readFileSync31(hubTokenPath, "utf-8").trim() : void 0;
       if (!token) return null;
@@ -224906,7 +224990,7 @@ ${reason}`;
   }
   startupBlank();
   const logFile = getStartupLogFile();
-  const logFileName = logFile.split("/").pop() ?? logFile;
+  const logFileName = logFile.replace(/.*[/\\]/, "") || logFile;
   const uiUrl = `http://localhost:${apiPort}`;
   progress?.finish(uiUrl);
   onProgress?.("ready", `server ready at ${uiUrl}`);
@@ -225611,8 +225695,8 @@ ${C3.BOLD}${C3.CYAN}\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
     }
   }
   section("Storage");
-  const { homedir: homedir28 } = await import("node:os");
-  const storageDir = `${homedir28()}/.markus`;
+  const { homedir: homedir29 } = await import("node:os");
+  const storageDir = `${homedir29()}/.markus`;
   const dataFile = `${storageDir}/data.db`;
   try {
     if (!fs.existsSync(storageDir)) {
@@ -225636,7 +225720,7 @@ ${C3.BOLD}${C3.CYAN}\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
     checkFail(`Storage check failed: ${e}`);
   }
   section("Skills");
-  const skillsDir = `${homedir28()}/.markus/skills`;
+  const skillsDir = `${homedir29()}/.markus/skills`;
   if (fs.existsSync(skillsDir)) {
     try {
       const entries2 = fs.readdirSync(skillsDir);
@@ -225715,9 +225799,9 @@ ${C3.BOLD}\u25C6 Summary${C3.RESET}
   }
 }
 async function getDefaultConfigPath2() {
-  const { homedir: homedir28 } = await import("node:os");
-  const { join: join39 } = await import("node:path");
-  return join39(homedir28(), ".markus", "markus.json");
+  const { homedir: homedir29 } = await import("node:os");
+  const { join: join40 } = await import("node:path");
+  return join40(homedir29(), ".markus", "markus.json");
 }
 function registerDoctorCommand(program2) {
   program2.command("doctor").description("Diagnose Markus configuration issues and environment health").option("--fix", "Attempt to automatically fix issues").option("--verbose", "Show detailed output").action(async (opts) => {
@@ -226128,8 +226212,8 @@ __export(update_exports, {
 });
 import { execSync as execSync6, spawnSync } from "node:child_process";
 import { existsSync as existsSync42, mkdirSync as mkdirSync31, renameSync, rmSync as rmSync4, createWriteStream as createWriteStream3 } from "node:fs";
-import { join as join38 } from "node:path";
-import { homedir as homedir27, platform as platform6, arch as arch3 } from "node:os";
+import { join as join39 } from "node:path";
+import { homedir as homedir28, platform as platform8, arch as arch3 } from "node:os";
 import { pipeline } from "node:stream/promises";
 import { Readable } from "node:stream";
 function detectInstallMethod() {
@@ -226140,7 +226224,7 @@ function detectInstallMethod() {
   if (execPath.includes("node_modules") || execPath.includes("/usr/local/lib/")) {
     return "npm";
   }
-  const markusAppDir = join38(homedir27(), ".markus", "app");
+  const markusAppDir = join39(homedir28(), ".markus", "app");
   if (execPath.startsWith(markusAppDir) || execPath.includes(".markus")) {
     return "binary";
   }
@@ -226150,7 +226234,7 @@ function detectInstallMethod() {
   return "unknown";
 }
 function getDownloadUrl(version) {
-  const os = platform6();
+  const os = platform8();
   const a = arch3();
   const platformStr = os === "win32" ? "win" : os;
   const archStr = a === "arm64" ? "arm64" : "x64";
@@ -226174,9 +226258,9 @@ async function updateViaNpm(targetVersion) {
   \u2713 Updated successfully. Restart markus to use the new version.`);
 }
 async function updateBinary(targetVersion) {
-  const appDir = join38(homedir27(), ".markus", "app");
-  const tmpDir = join38(homedir27(), ".markus", ".update-tmp");
-  const backupDir = join38(homedir27(), ".markus", ".update-backup");
+  const appDir = join39(homedir28(), ".markus", "app");
+  const tmpDir = join39(homedir28(), ".markus", ".update-tmp");
+  const backupDir = join39(homedir28(), ".markus", ".update-backup");
   console.log(`  Downloading v${targetVersion}...`);
   const url = getDownloadUrl(targetVersion);
   try {
@@ -226185,7 +226269,7 @@ async function updateBinary(targetVersion) {
       throw new Error(`Download failed: HTTP ${res.status} from ${url}`);
     }
     mkdirSync31(tmpDir, { recursive: true });
-    const tarPath = join38(tmpDir, "markus-update.tar.gz");
+    const tarPath = join39(tmpDir, "markus-update.tar.gz");
     const fileStream = createWriteStream3(tarPath);
     await pipeline(Readable.fromWeb(res.body), fileStream);
     console.log("  Extracting...");
@@ -226194,14 +226278,14 @@ async function updateBinary(targetVersion) {
       if (existsSync42(backupDir)) rmSync4(backupDir, { recursive: true });
       renameSync(appDir, backupDir);
     }
-    const extracted = join38(tmpDir, "markus");
+    const extracted = join39(tmpDir, "markus");
     if (existsSync42(extracted)) {
       renameSync(extracted, appDir);
     } else {
       mkdirSync31(appDir, { recursive: true });
       execSync6(`mv "${tmpDir}"/* "${appDir}/" 2>/dev/null || true`, { stdio: "pipe", shell: "/bin/sh" });
     }
-    const verifyResult = spawnSync(join38(appDir, "bin", "markus"), ["--version"], {
+    const verifyResult = spawnSync(join39(appDir, "bin", "markus"), ["--version"], {
       encoding: "utf-8",
       timeout: 1e4
     });
@@ -226372,19 +226456,19 @@ __export(install_agent_exports, {
 import { execSync as execSync7 } from "node:child_process";
 import { randomBytes as randomBytes6 } from "node:crypto";
 function registerInstallAgentCommands(program2) {
-  program2.command("install <platform>").description("Install an external agent platform and connect it to Markus").option("--org-id <id>", "Organization ID", "default").option("--agent-name <name>", "Agent display name").option("--skip-install", "Skip npm install (platform already installed)").option("--skip-init", "Skip platform initialization").option("--skip-connect", "Only install, do not register with Markus").action(async (platform7, opts, cmd) => {
+  program2.command("install <platform>").description("Install an external agent platform and connect it to Markus").option("--org-id <id>", "Organization ID", "default").option("--agent-name <name>", "Agent display name").option("--skip-install", "Skip npm install (platform already installed)").option("--skip-init", "Skip platform initialization").option("--skip-connect", "Only install, do not register with Markus").action(async (platform9, opts, cmd) => {
     const g = cmd.optsWithGlobals();
-    const connector = findConnector(platform7);
+    const connector = findConnector(platform9);
     if (!connector) {
       const available = loadConnectors().map((c) => c.platform).join(", ");
-      fail(`Unknown platform "${platform7}". Available: ${available || "none"}`);
+      fail(`Unknown platform "${platform9}". Available: ${available || "none"}`);
       return;
     }
     console.log(`
   Installing ${connector.displayName}...
 `);
     const scan = scanInstalledPlatforms();
-    const existing = scan.find((s2) => s2.platform === platform7);
+    const existing = scan.find((s2) => s2.platform === platform9);
     const alreadyInstalled = existing?.installed;
     if (alreadyInstalled && !opts.skipInstall) {
       console.log(`  [1/5] ${connector.displayName} is already installed.`);
@@ -226420,13 +226504,13 @@ function registerInstallAgentCommands(program2) {
       console.log(`  [4/5] Token generation skipped.`);
       console.log(`  [5/5] Config write skipped.`);
       console.log(`
-  ${connector.displayName} installed. Run \`markus install ${platform7}\` again without --skip-connect to connect later.
+  ${connector.displayName} installed. Run \`markus install ${platform9}\` again without --skip-connect to connect later.
 `);
       return;
     }
     const client = createClient(g);
     const serverUrl = g.server || process.env["MARKUS_API_URL"] || "http://localhost:8056";
-    const agentId2 = `${platform7}-${randomBytes6(4).toString("hex")}`;
+    const agentId2 = `${platform9}-${randomBytes6(4).toString("hex")}`;
     const agentName = opts.agentName || connector.defaultAgentName || `${connector.displayName} Agent`;
     const capabilities = connector.defaultCapabilities ?? [];
     try {
@@ -226489,7 +226573,7 @@ function registerInstallAgentCommands(program2) {
   Connection failed: ${e.message}`);
         console.log(`  ${connector.displayName} was installed but could not connect to Markus.`);
         console.log(`  Make sure the Markus server is running (\`markus start\`), then run:`);
-        console.log(`    markus install ${platform7}
+        console.log(`    markus install ${platform9}
 `);
         return;
       }