stratagate-dsh 0.2.73 → 0.2.75

package/dist/plugin.js

@@ -6042,11 +6042,68 @@ function workspaceDisplayName(cwd) {
 function feedbackText(value, maximum) {
   return typeof value === "string" ? value.trim().slice(0, maximum) : "";
 }
+var FEEDBACK_MARKDOWN_HEADINGS = {
+  description: "\u95EE\u9898\u63CF\u8FF0",
+  reproduction: "\u590D\u73B0\u6B65\u9AA4",
+  expected: "\u9884\u671F\u884C\u4E3A",
+  actual: "\u5B9E\u9645\u884C\u4E3A",
+  errorContext: "\u76F8\u5173\u9519\u8BEF\u4FE1\u606F"
+};
+function patchFeedbackMarkdown(markdown, input) {
+  let result = markdown.trim();
+  for (const [key, heading] of Object.entries(FEEDBACK_MARKDOWN_HEADINGS)) {
+    if (!Object.prototype.hasOwnProperty.call(input, key)) continue;
+    const raw = input[key];
+    const text3 = Array.isArray(raw) ? raw.map((item, index) => {
+      const value = feedbackText(item, 2e3);
+      return value ? `${index + 1}. ${value}` : "";
+    }).filter(Boolean).join("\n") : feedbackText(raw, key === "description" ? 2e4 : key === "expected" || key === "actual" ? 1e4 : 2e4);
+    const marker = `## ${heading}`;
+    const lines = result.split("\n");
+    let fence = null;
+    let sectionStart = -1;
+    let sectionEnd = lines.length;
+    for (let index = 0; index < lines.length; index += 1) {
+      const line = (lines[index] ?? "").replace(/\r$/, "");
+      if (fence) {
+        const closingFence = line.match(/^ {0,3}(`+|~+)[ \t]*$/);
+        if (closingFence?.[1]?.[0] === fence.character && closingFence[1].length >= fence.length) fence = null;
+        continue;
+      }
+      const openingFence = line.match(/^ {0,3}(`{3,}|~{3,})(.*)$/);
+      if (openingFence?.[1] && (openingFence[1][0] === "~" || !openingFence[2]?.includes("`"))) {
+        fence = { character: openingFence[1][0], length: openingFence[1].length };
+        continue;
+      }
+      if (line === marker && sectionStart < 0) {
+        sectionStart = index;
+        continue;
+      }
+      if (sectionStart >= 0 && /^##\s+\S/.test(line)) {
+        sectionEnd = index;
+        break;
+      }
+    }
+    if (sectionStart < 0) {
+      if (text3) result = `${result ? `${result}
+
+` : ""}${marker}
+
+${text3}`;
+      continue;
+    }
+    const replacement = text3 ? [marker, "", ...text3.split("\n")] : [];
+    lines.splice(sectionStart, sectionEnd - sectionStart, ...replacement);
+    result = lines.join("\n").trim();
+  }
+  return result.trim();
+}
 function normalizeFeedbackDraft(input, previous) {
   const has = (key) => Object.prototype.hasOwnProperty.call(input, key);
   const replacesStructuredBody = has("bodyMarkdown");
+  const updatesStructuredBody = ["description", "reproduction", "expected", "actual", "errorContext"].some((key) => has(key));
   const reproduction = replacesStructuredBody ? [] : has("reproduction") ? (Array.isArray(input.reproduction) ? input.reproduction : []).map((value) => feedbackText(value, 2e3)).filter(Boolean).slice(0, 20) : previous?.reproduction ?? [];
-  const bodyMarkdown = has("bodyMarkdown") ? feedbackText(input.bodyMarkdown, 5e4) : previous?.bodyMarkdown;
+  const bodyMarkdown = has("bodyMarkdown") ? feedbackText(input.bodyMarkdown, 5e4) : updatesStructuredBody && previous?.bodyMarkdown ? patchFeedbackMarkdown(previous.bodyMarkdown, input) : previous?.bodyMarkdown;
   return {
     title: has("title") ? feedbackText(input.title, 240) : previous?.title ?? "",
     description: replacesStructuredBody ? "" : has("description") ? feedbackText(input.description, 2e4) : previous?.description ?? "",
@@ -6704,7 +6761,8 @@ var StrataGateRuntime = class {
   }
   async prepareFeedback(session, input) {
     const namespace = this.namespaceFor(session);
-    const draft = normalizeFeedbackDraft(input);
+    const previous = this.loadFeedbackDraft(namespace);
+    const draft = normalizeFeedbackDraft(input, previous);
     this.saveFeedbackDraft(namespace, draft);
     const feedbackUrl = feedbackDraftUrl(namespace, this.feedbackOrigin());
     return {
@@ -8145,8 +8203,31 @@ function currentPluginVersion() {
 }
 var STRATAGATE_DSH_VERSION = currentPluginVersion();
 function graphProjectionIsProcessing(job) {
-  if (job.status === "running") return true;
-  return job.attempts < DERIVATION_MAX_ATTEMPTS && (job.status === "pending" || job.status === "failed" && job.nextRetryAt !== null);
+  return derivationJobState(job, false) === "processing" || derivationJobState(job, false) === "retryable";
+}
+function derivationJobState(job, completed) {
+  if (completed || job.status === "succeeded" || job.status === "skipped" || job.status === "completed") return "completed";
+  if (job.status === "running") return "processing";
+  if (job.status === "pending") return job.attempts < DERIVATION_MAX_ATTEMPTS ? "processing" : "blocked";
+  if (job.status === "failed") {
+    const retryable = job.attempts < DERIVATION_MAX_ATTEMPTS && job.nextRetryAt !== null && Number.isFinite(Date.parse(job.nextRetryAt));
+    return retryable ? "retryable" : "terminal-failed";
+  }
+  return "blocked";
+}
+function summarizeDerivationJobs(jobs, completed) {
+  const result = { processing: 0, retryable: 0, terminalFailed: 0, completed: 0, blocked: 0 };
+  for (const job of jobs) {
+    const state = derivationJobState(job, completed(job));
+    if (state === "processing") result.processing += 1;
+    else if (state === "retryable") {
+      result.retryable += 1;
+      result.processing += 1;
+    } else if (state === "terminal-failed") result.terminalFailed += 1;
+    else if (state === "completed") result.completed += 1;
+    else result.blocked += 1;
+  }
+  return result;
 }
 function installedPackageVersion(names) {
   for (const name2 of names) {
@@ -8441,10 +8522,12 @@ async function overview(runtime, cachedEntries) {
       }] : [];
     });
     const describeBlockJob = (kind, job) => {
+      const state = derivationJobState(job, kind === "block-summary" ? job.status === "succeeded" : job.status === "succeeded" || job.status === "skipped");
       const details = blockDetails([job.blockId]);
       return {
         id: job.blockId,
         kind,
+        state,
         status: job.status,
         attempts: job.attempts,
         nextRetryAt: job.nextRetryAt,
@@ -8460,11 +8543,13 @@ async function overview(runtime, cachedEntries) {
       };
     };
     const describeGraphJob = (job) => {
+      const state = derivationJobState(job, job.status === "completed");
       const blockIds = [...new Set(job.sourceEventIds.flatMap((eventId) => snapshot.events.find(({ id }) => id === eventId)?.sourceBlockId ?? []))];
       const details = blockDetails(blockIds);
       return {
         id: job.id,
         kind: "graph-projection",
+        state,
         status: job.status,
         attempts: job.attempts,
         nextRetryAt: job.nextRetryAt,
@@ -8478,16 +8563,19 @@ async function overview(runtime, cachedEntries) {
         sourceEventIds: job.sourceEventIds
       };
     };
-    const failedJobs = snapshot.summaryJobs.filter(({ status }) => status === "failed").length + snapshot.extractionJobs.filter(({ status }) => status === "failed").length + snapshot.graphProjectionJobs.filter(({ status }) => status === "failed").length;
-    const processingJobs = snapshot.summaryJobs.filter(({ status, nextRetryAt }) => status === "pending" || status === "running" || status === "failed" && nextRetryAt !== null).length + snapshot.extractionJobs.filter(({ status, nextRetryAt }) => status === "running" || status === "failed" && nextRetryAt !== null).length + snapshot.graphProjectionJobs.filter(graphProjectionIsProcessing).length;
+    const summaryStatus = summarizeDerivationJobs(snapshot.summaryJobs, (job) => job.status === "succeeded");
+    const extractionStatus = summarizeDerivationJobs(snapshot.extractionJobs, (job) => job.status === "succeeded" || job.status === "skipped");
+    const graphStatus = summarizeDerivationJobs(snapshot.graphProjectionJobs, (job) => job.status === "completed");
+    const failedJobs = summaryStatus.terminalFailed + extractionStatus.terminalFailed + graphStatus.terminalFailed;
+    const processingJobs = summaryStatus.processing + extractionStatus.processing + graphStatus.processing;
     const failedJobDetails = [
       ...snapshot.summaryJobs.filter(({ status }) => status === "failed").map((job) => describeBlockJob("block-summary", job)),
       ...snapshot.extractionJobs.filter(({ status }) => status === "failed").map((job) => describeBlockJob("event-extraction", job)),
       ...snapshot.graphProjectionJobs.filter(({ status }) => status === "failed").map(describeGraphJob)
     ];
     const processingJobDetails = [
-      ...snapshot.summaryJobs.filter(({ status, nextRetryAt }) => status === "pending" || status === "running" || status === "failed" && nextRetryAt !== null).map((job) => describeBlockJob("block-summary", job)),
-      ...snapshot.extractionJobs.filter(({ status, nextRetryAt }) => status === "running" || status === "failed" && nextRetryAt !== null).map((job) => describeBlockJob("event-extraction", job)),
+      ...snapshot.summaryJobs.filter((job) => derivationJobState(job, job.status === "succeeded") === "processing" || derivationJobState(job, job.status === "succeeded") === "retryable").map((job) => describeBlockJob("block-summary", job)),
+      ...snapshot.extractionJobs.filter((job) => derivationJobState(job, job.status === "succeeded" || job.status === "skipped") === "processing" || derivationJobState(job, job.status === "succeeded" || job.status === "skipped") === "retryable").map((job) => describeBlockJob("event-extraction", job)),
       ...snapshot.graphProjectionJobs.filter(graphProjectionIsProcessing).map(describeGraphJob)
     ];
     const timestamps = [
@@ -8511,12 +8599,27 @@ async function overview(runtime, cachedEntries) {
       elements: snapshot.elements.length,
       graphNodes: snapshot.graphNodes.length,
       graphEdges: snapshot.graphEdges.length,
+      taskStatus: {
+        blockSummary: summaryStatus,
+        eventExtraction: extractionStatus,
+        graphProjection: graphStatus
+      },
       graphMigration: (() => {
         const projected = new Set(snapshot.graphProjectionJobs.filter(({ status, projectorVersion }) => status === "completed" && projectorVersion === KNOWLEDGE_GRAPH_PROJECTOR_VERSION).flatMap(({ sourceEventIds }) => sourceEventIds)).size;
-        const failed = snapshot.graphProjectionJobs.filter(({ status }) => status === "failed").length;
-        const running = snapshot.graphProjectionJobs.filter(({ status }) => status === "running").length;
         const total = snapshot.events.filter(({ status }) => status !== "forgotten" && status !== "archived").length;
-        return { projected, total, failed, running, complete: projected >= total };
+        const complete = projected >= total;
+        const state = complete ? "complete" : graphStatus.processing > 0 ? "processing" : graphStatus.terminalFailed > 0 ? "failed" : "incomplete";
+        return {
+          projected,
+          total,
+          pending: snapshot.graphProjectionJobs.filter(({ status }) => status === "pending").length,
+          running: snapshot.graphProjectionJobs.filter(({ status }) => status === "running").length,
+          failed: graphStatus.terminalFailed,
+          retryable: graphStatus.retryable,
+          processing: graphStatus.processing,
+          state,
+          complete
+        };
       })(),
       usageReceipts: snapshot.usageReceipts.length,
       memoryUseCount: snapshot.usageReceipts.filter((receipt) => receipt.eventIds.length > 0 || receipt.elementIds.length > 0).length,
@@ -8855,13 +8958,19 @@ async function memories(runtime, url) {
       clusters: clusterKnowledgeGraph(snapshot.graphNodes, snapshot.graphEdges),
       migration: (() => {
         const projected = new Set(snapshot.graphProjectionJobs.filter(({ status, projectorVersion }) => status === "completed" && projectorVersion === KNOWLEDGE_GRAPH_PROJECTOR_VERSION).flatMap(({ sourceEventIds }) => sourceEventIds)).size;
+        const graphStatus = summarizeDerivationJobs(snapshot.graphProjectionJobs, (job) => job.status === "completed");
+        const total = snapshot.events.filter(({ status }) => status !== "forgotten" && status !== "archived").length;
+        const complete = projected >= total;
         return {
           projected,
-          total: snapshot.events.filter(({ status }) => status !== "forgotten" && status !== "archived").length,
+          total,
           pending: snapshot.graphProjectionJobs.filter(({ status }) => status === "pending").length,
           running: snapshot.graphProjectionJobs.filter(({ status }) => status === "running").length,
-          failed: snapshot.graphProjectionJobs.filter(({ status }) => status === "failed").length,
-          complete: projected >= snapshot.events.filter(({ status }) => status !== "forgotten" && status !== "archived").length
+          failed: graphStatus.terminalFailed,
+          retryable: graphStatus.retryable,
+          processing: graphStatus.processing,
+          state: complete ? "complete" : graphStatus.processing > 0 ? "processing" : graphStatus.terminalFailed > 0 ? "failed" : "incomplete",
+          complete
         };
       })()
     };