@markus-global/cli 0.6.1 → 0.6.3

package/dist/markus.mjs

@@ -5184,12 +5184,45 @@ ${truncatedContent}
 `;
           }
           if (updated.length > MEMORY_MD_TOTAL_MAX_CHARS) {
-            log5.warn("MEMORY.md total size exceeds limit, refusing write", {
+            log5.warn("MEMORY.md total size exceeds limit, attempting compression", {
               key: key2,
               fileSize: updated.length,
               limit: MEMORY_MD_TOTAL_MAX_CHARS
             });
-            return;
+            const compressed = this.compressLongTermMemory();
+            if (compressed.charsAfter < updated.length) {
+              log5.info("Compression freed space, retrying write", {
+                key: key2,
+                charsFreed: updated.length - compressed.charsAfter
+              });
+              existing = readFileSync4(this.longTermFile, "utf-8");
+              if (existing.includes(sectionHeader)) {
+                const regex = new RegExp(`(## ${key2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")})\\n[\\s\\S]*?(?=\\n## |$)`);
+                updated = existing.replace(regex, `${sectionHeader}
+${truncatedContent}
+`);
+              } else {
+                updated = existing + `
+${sectionHeader}
+${truncatedContent}
+`;
+              }
+              if (updated.length > MEMORY_MD_TOTAL_MAX_CHARS) {
+                log5.warn("MEMORY.md still exceeds limit even after compression, refusing write", {
+                  key: key2,
+                  fileSize: updated.length,
+                  limit: MEMORY_MD_TOTAL_MAX_CHARS
+                });
+                return;
+              }
+            } else {
+              log5.warn("MEMORY.md still exceeds limit after compression, refusing write", {
+                key: key2,
+                fileSize: updated.length,
+                limit: MEMORY_MD_TOTAL_MAX_CHARS
+              });
+              return;
+            }
           }
           writeFileSync3(this.longTermFile, updated);
           log5.debug("Long-term memory updated", { key: key2, sectionChars: truncatedContent.length, totalChars: updated.length });
@@ -5365,6 +5398,62 @@ ${tail}`;
           this.saveDebounce = null;
         }, 1e3);
       }
+      /** Compress MEMORY.md — truncate oversized sections to prevent context bloat */
+      compressLongTermMemory() {
+        if (!existsSync6(this.longTermFile)) {
+          return { charsBefore: 0, charsAfter: 0, sectionsBefore: 0, sectionsAfter: 0, truncatedChunks: 0 };
+        }
+        const content = readFileSync4(this.longTermFile, "utf-8");
+        const charsBefore = content.length;
+        const lines = content.split("\n");
+        let i = 0;
+        const preambleLines = [];
+        while (i < lines.length && !lines[i].startsWith("## ")) {
+          preambleLines.push(lines[i]);
+          i++;
+        }
+        const sections = [];
+        let currentHeader = "";
+        let currentBody = [];
+        while (i < lines.length) {
+          const line = lines[i];
+          if (line.startsWith("## ")) {
+            if (currentHeader) {
+              sections.push({ headerLine: currentHeader, body: currentBody });
+            }
+            currentHeader = line;
+            currentBody = [];
+          } else {
+            currentBody.push(line);
+          }
+          i++;
+        }
+        if (currentHeader) {
+          sections.push({ headerLine: currentHeader, body: currentBody });
+        }
+        const sectionsBefore = sections.length;
+        let truncatedChunks = 0;
+        const outputLines = [...preambleLines];
+        for (const section4 of sections) {
+          const bodyStr = section4.body.join("\n");
+          if (bodyStr.length > MEMORY_MD_SECTION_MAX_CHARS) {
+            const truncatedBody = bodyStr.slice(0, MEMORY_MD_SECTION_MAX_CHARS);
+            outputLines.push(section4.headerLine, truncatedBody);
+            truncatedChunks++;
+          } else {
+            outputLines.push(section4.headerLine, bodyStr);
+          }
+        }
+        const compressed = outputLines.join("\n");
+        writeFileSync3(this.longTermFile, compressed);
+        return {
+          charsBefore,
+          charsAfter: compressed.length,
+          sectionsBefore,
+          sectionsAfter: sections.length,
+          truncatedChunks
+        };
+      }
     };
   }
 });
@@ -43522,6 +43611,15 @@ var init_attention = __esm({
       clearPreemptionSignal() {
         this.criticalInterruptResolve = void 0;
       }
+      /**
+       * Clear the lastYieldDecision flag set by checkYieldPoint().
+       * Used by processing code that handles preemption internally (e.g. task
+       * execution delegates resumption to TaskService) so the attention loop
+       * completes the item normally instead of deferring it.
+       */
+      clearLastYieldDecision() {
+        this.lastYieldDecision = void 0;
+      }
       /**
        * Called from the Agent's tool loop at safe yield points (between LLM turns).
        * If an interrupt signal is pending, evaluates whether to continue or switch.
@@ -45629,11 +45727,19 @@ ${notification.stdoutTail}`);
             }
             case "task_status_update": {
               if (extra.triggerExecution && item.payload.taskId) {
+                if (typeof extra.onLog !== "function") {
+                  log17.info("Skipping resurfaced task execution item (closures lost)", {
+                    agentId: this.id,
+                    taskId: item.payload.taskId
+                  });
+                  resolveResponse("");
+                  return;
+                }
                 const taskId2 = item.payload.taskId;
                 const description = item.payload.content;
-                const onLog = extra.onLog ?? (() => {
-                });
+                const onLog = extra.onLog;
                 await this.executeTask(taskId2, description, onLog, extra.cancelToken, extra.taskProjectContext, extra.executionRound, item.payload.requirementId);
+                this.attentionController.clearLastYieldDecision();
                 resolveResponse("");
                 return;
               }
@@ -47127,6 +47233,12 @@ ${chatYield.item.payload.content}`;
         }
       }
       async handleMessageStream(userMessage, onEvent, senderId, senderInfo, cancelToken, images, fileNames) {
+        if (cancelToken?.cancelled) {
+          log17.info("Stream cancelled before processing started", { agentId: this.id });
+          if (this.activeTasks.size === 0)
+            this.setStatus("idle");
+          return "";
+        }
         if (this.activeTasks.size === 0) {
           this.setStatus("working");
         }
@@ -47248,10 +47360,11 @@ ${chatYield.item.payload.content}`;
             }
             if (cancelToken?.cancelled) {
               log17.info("Stream cancelled by user during tool loop", { agentId: this.id });
-              if (lastResponseContent && this.currentSessionId) {
+              if (this.currentSessionId) {
+                const content = lastResponseContent ? lastResponseContent + "\n\n[interrupted by user]" : "[interrupted by user]";
                 this.memory.appendMessage(this.currentSessionId, {
                   role: "assistant",
-                  content: lastResponseContent + "\n\n[interrupted by user]"
+                  content
                 });
               }
               if (streamChatActivityId)
@@ -47271,6 +47384,19 @@ ${chatYield.item.payload.content}`;
                 content: "[Continue from where you left off. Do not repeat what you already said.]"
               });
             } else {
+              if (cancelToken?.cancelled) {
+                log17.info("Stream cancelled before tool execution", { agentId: this.id });
+                this.memory.appendMessage(this.currentSessionId, {
+                  role: "assistant",
+                  content: response.content + "\n\n[interrupted by user]",
+                  reasoningContent: response.reasoningContent
+                });
+                if (streamChatActivityId)
+                  this.endActivity(streamChatActivityId);
+                if (this.activeTasks.size === 0)
+                  this.setStatus("idle");
+                return response.content || lastResponseContent || "";
+              }
               this.memory.appendMessage(this.currentSessionId, {
                 role: "assistant",
                 content: response.content,
@@ -47373,10 +47499,11 @@ ${streamYield.item.payload.content}`;
             const updatedMessages = preparedCont.messages;
             if (cancelToken?.cancelled) {
               log17.info("Stream cancelled before LLM re-call", { agentId: this.id });
-              if (lastResponseContent && this.currentSessionId) {
+              if (this.currentSessionId) {
+                const content = lastResponseContent ? lastResponseContent + "\n\n[interrupted by user]" : "[interrupted by user]";
                 this.memory.appendMessage(this.currentSessionId, {
                   role: "assistant",
-                  content: lastResponseContent + "\n\n[interrupted by user]"
+                  content
                 });
               }
               if (streamChatActivityId)
@@ -47433,11 +47560,12 @@ ${streamYield.item.payload.content}`;
           if (streamChatActivityId)
             this.endActivity(streamChatActivityId, { success: !cancelToken?.cancelled });
           if (cancelToken?.cancelled) {
-            if (lastResponseContent && this.currentSessionId) {
+            if (this.currentSessionId) {
               try {
+                const content = lastResponseContent ? lastResponseContent + "\n\n[interrupted by user]" : "[interrupted by user]";
                 this.memory.appendMessage(this.currentSessionId, {
                   role: "assistant",
-                  content: lastResponseContent + "\n\n[interrupted by user]"
+                  content
                 });
               } catch {
               }
@@ -49240,7 +49368,8 @@ ${promo.content}` : promo.content;
       }
       /**
        * Enforce MEMORY.md hygiene: remove daily-report sections (they belong in
-       * daily-logs/), strip leaked LLM <think> blocks, and enforce section size limits.
+       * daily-logs/), strip leaked LLM <think> blocks, and enforce section/total
+       * size limits via heuristic compression.
        */
       pruneMemoryMd() {
         const content = this.memory.getLongTermMemory();
@@ -49280,6 +49409,15 @@ ${promo.content}` : promo.content;
           writeFileSync8(memoryMdPath, pruned + "\n");
           log17.info("Pruned MEMORY.md: removed daily-report sections and LLM artifacts", { agentId: this.id });
         }
+        const compressed = this.memory.compressLongTermMemory();
+        if (compressed.truncatedChunks > 0) {
+          log17.info("Compressed MEMORY.md during Dream Cycle", {
+            agentId: this.id,
+            charsBefore: compressed.charsBefore,
+            charsAfter: compressed.charsAfter,
+            sectionsTrimmed: compressed.truncatedChunks
+          });
+        }
       }
     };
   }
@@ -52395,16 +52533,23 @@ function createMemoryTools(ctx) {
             let entries2 = semResults.map((r) => r.entry);
             if (type)
               entries2 = entries2.filter((e) => e.type === type);
-            log24.debug("Semantic memory search", { agentId: ctx.agentId, query: query2, results: entries2.length });
-            return JSON.stringify({
-              results: entries2.map((e) => ({
-                id: e.id,
-                type: e.type,
-                content: e.content,
-                timestamp: e.timestamp,
-                similarity: semResults.find((r) => r.entry.id === e.id)?.similarity
-              })),
-              count: entries2.length
+            if (entries2.length > 0) {
+              log24.debug("Semantic memory search", { agentId: ctx.agentId, query: query2, results: entries2.length });
+              return JSON.stringify({
+                results: entries2.map((e) => ({
+                  id: e.id,
+                  type: e.type,
+                  content: e.content,
+                  timestamp: e.timestamp,
+                  similarity: semResults.find((r) => r.entry.id === e.id)?.similarity
+                })),
+                count: entries2.length,
+                searchMethod: "semantic"
+              });
+            }
+            log24.info("Semantic search returned 0 results, falling back to substring", {
+              agentId: ctx.agentId,
+              query: query2
             });
           } catch (err) {
             log24.warn("Semantic search failed, falling back to substring", { error: String(err) });
@@ -52423,7 +52568,8 @@ function createMemoryTools(ctx) {
             timestamp: e.timestamp,
             tags: e.metadata?.tags
           })),
-          count: results.length
+          count: results.length,
+          searchMethod: "substring"
         });
       }
     },
@@ -53143,29 +53289,34 @@ var init_semantic_search = __esm({
           log27.warn("Failed to index memory entry", { id: entry.id, error: String(err) });
         }
       }
+      /**
+       * Search indexed memories by semantic similarity.
+       *
+       * Returns an empty array when the service is not enabled.
+       *
+       * @throws {Error} Propagates embedding or vector-store errors to the caller
+       *   so that callers (e.g. memory_search tool) can implement their own
+       *   fallback strategy. Contrast with {@link indexMemory}, which silently
+       *   swallows errors because indexing is best-effort.
+       */
       async search(query2, opts) {
         if (!this.enabled)
           return [];
-        try {
-          const queryEmbedding = await this.embedding.embed(query2);
-          const results = await this.vectorStore.search(queryEmbedding, {
-            topK: opts?.topK ?? 5,
-            agentId: opts?.agentId,
-            minSimilarity: opts?.minSimilarity ?? 0.3
-          });
-          return results.map((r) => ({
-            entry: {
-              id: r.id,
-              content: r.content,
-              type: r.type,
-              timestamp: ""
-            },
-            similarity: r.similarity
-          }));
-        } catch (err) {
-          log27.warn("Semantic search failed, returning empty results", { error: String(err) });
-          return [];
-        }
+        const queryEmbedding = await this.embedding.embed(query2);
+        const results = await this.vectorStore.search(queryEmbedding, {
+          topK: opts?.topK ?? 5,
+          agentId: opts?.agentId,
+          minSimilarity: opts?.minSimilarity ?? 0.3
+        });
+        return results.map((r) => ({
+          entry: {
+            id: r.id,
+            content: r.content,
+            type: r.type,
+            timestamp: ""
+          },
+          similarity: r.similarity
+        }));
       }
       async deleteMemory(id) {
         if (!this.enabled)
@@ -53711,6 +53862,25 @@ You are ${request.name}.`,
             "- [ ] Scan recent channel messages for anything requiring attention"
           ].join("\n"), "utf-8");
         }
+        const sessionsDir = join12(agentDataDir, "sessions");
+        const dailyLogsDir = join12(agentDataDir, "daily-logs");
+        const memoryPath = join12(agentDataDir, "MEMORY.md");
+        mkdirSync11(sessionsDir, { recursive: true });
+        mkdirSync11(dailyLogsDir, { recursive: true });
+        if (!existsSync17(memoryPath)) {
+          writeFileSync10(memoryPath, [
+            "# Agent Memory",
+            "",
+            "## Your Knowledge",
+            "",
+            "## procedures",
+            "",
+            "## architecture",
+            "",
+            "## lessons-learned",
+            ""
+          ].join("\n"), "utf-8");
+        }
         const config = {
           id,
           name: request.name,
@@ -64414,7 +64584,7 @@ var init_builder_service = __esm({
           const memberRole = member.role ?? "worker";
           const memberName = member.name ?? "Agent";
           const memberSkills = member.skills ?? [];
-          const memberFilesDir = this.findMemberDir(artDir, memberName, usedMemberDirs);
+          const memberFilesDir = this.findMemberDir(artDir, memberName, usedMemberDirs, member.roleName);
           const hasCustomRole = !!memberFilesDir && existsSync24(join20(memberFilesDir, "ROLE.md"));
           if (memberFilesDir)
             usedMemberDirs.add(memberFilesDir);
@@ -64459,14 +64629,24 @@ var init_builder_service = __esm({
        * Find the member directory under artDir/members/ by trying multiple slug strategies.
        * Returns the absolute path to the member directory, or null if not found.
        */
-      findMemberDir(artDir, memberName, usedDirs) {
+      findMemberDir(artDir, memberName, usedDirs, roleName) {
         const membersBase = join20(artDir, "members");
         if (!existsSync24(membersBase))
           return null;
-        const slug = kebab(memberName, "agent");
-        const exact = join20(membersBase, slug);
-        if (existsSync24(exact) && !usedDirs.has(exact))
-          return exact;
+        const nameSlug = kebab(memberName);
+        if (nameSlug && !/^pkg-/.test(nameSlug)) {
+          const exact = join20(membersBase, nameSlug);
+          if (existsSync24(exact) && !usedDirs.has(exact))
+            return exact;
+        }
+        if (roleName) {
+          const roleSlug = kebab(roleName);
+          if (roleSlug && !/^pkg-/.test(roleSlug)) {
+            const roleDir = join20(membersBase, roleSlug);
+            if (existsSync24(roleDir) && !usedDirs.has(roleDir))
+              return roleDir;
+          }
+        }
         try {
           for (const entry of readdirSync8(membersBase, { withFileTypes: true })) {
             if (!entry.isDirectory())
@@ -64480,8 +64660,12 @@ var init_builder_service = __esm({
             try {
               const content = readFileSync18(rolePath, "utf-8");
               const title = content.match(/^#\s+(.+)$/m)?.[1]?.trim();
-              if (title && title.toLowerCase() === memberName.toLowerCase())
-                return candidateDir;
+              if (title) {
+                const tLower = title.toLowerCase();
+                const nLower = memberName.toLowerCase();
+                if (tLower === nLower || tLower.includes(nLower) || nLower.includes(tLower))
+                  return candidateDir;
+              }
             } catch {
             }
           }
@@ -64997,6 +65181,9 @@ var init_sse_handler = __esm({
           } else if (this.options.isResume) {
             this.sessionId = this.options.sessionId ?? null;
           }
+          if (this.sessionId && this.sseBuffer && !this.sseDisconnected) {
+            this.sseBuffer.send({ type: "session_start", sessionId: this.sessionId });
+          }
           const reply = await this.options.agent.sendMessageStream(this.options.userText, (event) => this.handleStreamEvent(event), this.options.senderId, this.options.senderInfo, this.cancelToken, this.options.images, this.options.fileNames);
           const finalNow = (/* @__PURE__ */ new Date()).toISOString();
           let finalThinking;
@@ -70309,9 +70496,9 @@ EXPLANATION_END`;
                 writeFileSync16(join22(artDir, "NORMS.md"), norms, "utf-8");
               }
               const rawMembers = Array.isArray(artifact.team?.members) ? artifact.team.members : Array.isArray(artifact.members) ? artifact.members : [];
-              for (const m of rawMembers) {
+              for (const [idx, m] of rawMembers.entries()) {
                 const mName = m.name ?? "Agent";
-                const slug = kebab(mName, "agent");
+                const slug = kebab(mName, "member-" + idx);
                 const memberDir = join22(artDir, "members", slug);
                 const roleContent = m.roleContent || m.role_md;
                 const policiesContent = m.policiesContent || m.policies_md;
@@ -72660,11 +72847,11 @@ EXPLANATION_END`;
           }
           const rolesRoot = rolesCandidates.find((d) => ex(d)) ?? rolesDir;
           const files = {};
-          for (const member of tpl.members) {
+          for (const [idx, member] of tpl.members.entries()) {
             const roleName = member.roleName;
             if (!roleName)
               continue;
-            const memberSlug = (member.name ?? roleName).toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "").replace(/-{2,}/g, "-").replace(/^-|-$/g, "");
+            const memberSlug = kebab(member.name ?? roleName, "member-" + idx);
             const roleDir = resolve13(rolesRoot, roleName);
             if (!ex(roleDir))
               continue;