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

package/dist/markus.mjs

@@ -60132,13 +60132,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 +60147,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({
@@ -60844,13 +60841,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 +60856,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({
@@ -81109,11 +81103,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 +81600,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 +81623,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 +82766,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 +82817,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) }));
           }
@@ -82881,8 +82915,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 +82930,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;
@@ -83517,11 +83549,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"));
@@ -196731,18 +196769,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") {
@@ -208008,56 +208070,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 +208103,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 +208892,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 +209841,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 +209915,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 +211445,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));
@@ -223899,9 +223928,8 @@ async function startServerCore(config, values, opts) {
   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();