@mrrlin-dev/mcp 0.4.28 → 0.4.32

package/dist/bin.cjs

@@ -37388,6 +37388,22 @@ function isRunnableProposal(item) {
   return true;
 }
 
+// ../../packages/schemas/dist/task-notes.js
+var TASK_NOTES_BRIEF_SECTIONS = [
+  { heading: "Context", description: "why this task exists; link to parent/trigger task if follow-up." },
+  { heading: "Scope", description: "concrete actions and acceptance criteria." },
+  { heading: "References", description: "links, data, relevant findings (omit if nothing to reference)." }
+];
+var TASK_NOTES_JOURNAL_SECTIONS = [
+  { heading: "Result", description: "what was accomplished, key findings or metrics, follow-up tasks created." },
+  {
+    heading: "Recheck",
+    dated: true,
+    description: "what you checked, what you found, and what happens next."
+  }
+];
+var JOURNAL_HEADING_RE = new RegExp(`^##[ \\t]+(${TASK_NOTES_JOURNAL_SECTIONS.map((s) => s.heading).join("|")})\\b[ \\t]*(?:[\u2014\u2013-][ \\t]*(\\S.*?))?[ \\t]*$`);
+
 // ../../packages/schemas/dist/index.js
 var mrrlinTaskStatusSchema = external_exports.enum([
   "backlog",
@@ -41328,24 +41344,30 @@ function createFailureLog(opts = {}) {
   const windowMs = opts.windowMs ?? failureLogWindowMs();
   const now = opts.now ?? Date.now;
   const lastEmit = /* @__PURE__ */ new Map();
+  const KIND_NULL = "\0none";
   const counts = /* @__PURE__ */ new Map();
   let windowStartedAt = null;
   return {
     /** Decide whether this failure should be printed. Returns the suppressed count to include in
      *  the line when it is. */
     shouldEmit(operation, kind) {
-      const prev = lastEmit.get(operation);
-      const sameKind = prev != null && prev.kind === kind;
-      const withinWindow = prev != null && now() - prev.at < windowMs;
-      if (sameKind && withinWindow) {
+      const kindKey = kind ?? KIND_NULL;
+      let byKind = lastEmit.get(operation);
+      if (!byKind) {
+        byKind = /* @__PURE__ */ new Map();
+        lastEmit.set(operation, byKind);
+      }
+      const prev = byKind.get(kindKey);
+      if (prev != null && now() - prev.at < windowMs) {
         prev.suppressed += 1;
         return { emit: false, suppressed: prev.suppressed };
       }
-      const suppressed = sameKind ? prev?.suppressed ?? 0 : 0;
-      lastEmit.set(operation, { kind, at: now(), suppressed: 0 });
+      const suppressed = prev?.suppressed ?? 0;
+      byKind.set(kindKey, { at: now(), suppressed: 0 });
       return { emit: true, suppressed };
     },
-    /** A success resets the operation's suppression state, so the next failure always prints. */
+    /** A success resets the operation's suppression state for EVERY error kind, so the next failure
+     *  always prints regardless of which kind it is. */
     noteSuccess(operation) {
       lastEmit.delete(operation);
     },
@@ -41375,9 +41397,10 @@ function createFailureLog(opts = {}) {
     }
   };
 }
-function failureLogLine(label, error51, suppressed) {
+function failureLogLine(label, error51, suppressed, note) {
+  const noteText = note ? ` (${note})` : "";
   const tail2 = suppressed > 0 ? ` (${suppressed} identical suppressed since the last line)` : "";
-  return `[mrrlin-mcp director-bridge] ${label} failed: ${describeError(error51)}${tail2}
+  return `[mrrlin-mcp director-bridge] ${label} failed${noteText}: ${describeError(error51)}${tail2}
 `;
 }
 
@@ -41397,15 +41420,12 @@ function createTokenRefresher(opts) {
       opts.failureLog?.noteSuccess("tokenRefresh");
       opts.onOk?.();
     } catch (error51) {
-      const label = "token refresh (will retry next tick)";
+      const line = (suppressed) => failureLogLine("token refresh", error51, suppressed, "will retry next tick");
       if (opts.failureLog) {
         const { emit, suppressed } = opts.failureLog.shouldEmit("tokenRefresh", errorKind(error51));
-        if (emit) process.stderr.write(failureLogLine(label, error51, suppressed));
+        if (emit) process.stderr.write(line(suppressed));
       } else {
-        process.stderr.write(
-          `[mrrlin-mcp director-bridge] token refresh failed (will retry next tick): ${describeError(error51)}
-`
-        );
+        process.stderr.write(line(0));
       }
       opts.onError?.(error51);
     }
@@ -41833,7 +41853,7 @@ Do NOT derail the current task - if the operator has an in-flight question, answ
 }
 
 // src/_generated/version.ts
-var PKG_VERSION = "0.4.28";
+var PKG_VERSION = "0.4.32";
 
 // src/api-base-url-migrate.ts
 var import_node_fs3 = __toESM(require("node:fs"), 1);
@@ -46035,6 +46055,30 @@ function isDeployGateRunStatus(status) {
   return status === "dev_deploy" || status === "prod_deploy";
 }
 
+// src/prompts/task-notes-contract.ts
+function renderTaskNotesContractLines() {
+  const brief = TASK_NOTES_BRIEF_SECTIONS.map((s) => `    ## ${s.heading} \u2014 ${s.description}`);
+  const [result, recheck] = TASK_NOTES_JOURNAL_SECTIONS;
+  return [
+    "- Notes (markdown): write for a human operator scanning a task list.",
+    "  First line: one plain-text sentence summarizing the task (no heading).",
+    "  Then scale the structure to complexity:",
+    "  For simple tasks \u2014 the one-line summary may be enough. No headings required.",
+    "  For non-trivial tasks, use these sections as needed:",
+    ...brief,
+    "  When closing a task (update_task status=closed_done), APPEND a Result section:",
+    `    ## ${result?.heading} \u2014 ${result?.description}`,
+    "  When you revisit a task that already has a Result \u2014 a later verification, a retry, a status",
+    "  re-check \u2014 APPEND a dated entry instead of rewriting Result:",
+    `    ## ${recheck?.heading} \u2014 YYYY-MM-DD \u2014 ${recheck?.description}`,
+    "    Do NOT remove earlier sections \u2014 they remain useful for context.",
+    "  The sections above the first Result/Recheck are the brief (what the task IS); Result and",
+    "  Recheck are the execution journal (what HAPPENED). The task page renders them separately and",
+    "  collapses the journal, so keep each kind of content under the right heading.",
+    "  Adapt depth to the task: a one-line fix needs one sentence, not four headings."
+  ];
+}
+
 // src/turn-deadline.ts
 var DEFAULT_TURN_INTERRUPT_TIMEOUT_MS = 5e3;
 function withTimeout2(promise2, ms, message) {
@@ -46608,18 +46652,7 @@ var BASE_INSTRUCTIONS_PREFIX = [
   "- Title: short, actionable, human-readable. Describe what needs to happen, not internal jargon.",
   '  Good: "Audit crawled-not-indexed pages and fix 404 errors"',
   '  Bad: "GSC coverage triage crawled-not-indexed + 404"',
-  "- Notes (markdown): write for a human operator scanning a task list.",
-  "  First line: one plain-text sentence summarizing the task (no heading).",
-  "  Then scale the structure to complexity:",
-  "  For simple tasks \u2014 the one-line summary may be enough. No headings required.",
-  "  For non-trivial tasks, use these sections as needed:",
-  "    ## Context \u2014 why this task exists; link to parent/trigger task if follow-up.",
-  "    ## Scope \u2014 concrete actions and acceptance criteria.",
-  "    ## References \u2014 links, data, relevant findings (omit if nothing to reference).",
-  "  When closing a task (update_task status=closed_done), APPEND a Result section:",
-  "    ## Result \u2014 what was accomplished, key findings or metrics, follow-up tasks created.",
-  "    Do NOT remove earlier sections \u2014 they remain useful for context.",
-  "  Adapt depth to the task: a one-line fix needs one sentence, not four headings.",
+  ...renderTaskNotesContractLines(),
   "",
   // Slice 4 of token-efficient-execution-runs (D8). This is the ONLY way the reasoning behind a
   // decision survives past this conversation: a thread is retired once it has accumulated too many
@@ -48873,12 +48906,14 @@ async function compactChat(input, deps) {
   );
   if (exec.ok) {
     const summaryNorm = normalizeWhitespace(exec.text);
+    const hasSomethingToVerify = operatorMessages.length > 0;
     const allPresent = operatorMessages.every((op) => {
       const opNorm = normalizeWhitespace(op);
       return summaryNorm.includes(opNorm);
     });
+    const isBlank = exec.text.trim().length === 0;
     const withinBudget = Buffer.byteLength(exec.text, "utf8") <= input.budgetBytes;
-    if (allPresent && withinBudget) {
+    if (hasSomethingToVerify && allPresent && !isBlank && withinBudget) {
       return { kind: "summary", seed: exec.text };
     }
   }
@@ -48902,6 +48937,9 @@ async function compactChat(input, deps) {
     };
   }
   const seed = kept.reverse().map(renderMessage).join("\n");
+  if (seed.trim().length === 0) {
+    return { kind: "no-seed", note: "No chat content could be carried forward." };
+  }
   return { kind: "raw-tail", seed };
 }
 
@@ -54209,18 +54247,7 @@ function buildThreadStartParams(msg, config2, desiredModel) {
     "- Title: short, actionable, human-readable. Describe what needs to happen, not internal jargon.",
     '  Good: "Audit crawled-not-indexed pages and fix 404 errors"',
     '  Bad: "GSC coverage triage crawled-not-indexed + 404"',
-    "- Notes (markdown): write for a human operator scanning a task list.",
-    "  First line: one plain-text sentence summarizing the task (no heading).",
-    "  Then scale the structure to complexity:",
-    "  For simple tasks \u2014 the one-line summary may be enough. No headings required.",
-    "  For non-trivial tasks, use these sections as needed:",
-    "    ## Context \u2014 why this task exists; link to parent/trigger task if follow-up.",
-    "    ## Scope \u2014 concrete actions and acceptance criteria.",
-    "    ## References \u2014 links, data, relevant findings (omit if nothing to reference).",
-    "  When closing a task (update_task status=closed_done), APPEND a Result section:",
-    "    ## Result \u2014 what was accomplished, key findings or metrics, follow-up tasks created.",
-    "    Do NOT remove earlier sections \u2014 they remain useful for context.",
-    "  Adapt depth to the task: a one-line fix needs one sentence, not four headings.",
+    ...renderTaskNotesContractLines(),
     // early-intent-confirmation (design.md, "The chat contract"): the core block below is copied
     // VERBATIM from design.md, per tasks.md 10.1. It replaces an older sentence that also carried
     // "omit operatorSeedRequest only when there is genuinely no operator request behind the task
@@ -55182,13 +55209,15 @@ function createBridgeMessageHandler(deps) {
           provider: compactionSeat.id,
           weakModel: compactionSeat.models.weak
         });
-        const seed = result.kind === "no-seed" ? result.note : result.seed;
+        const rawSeed = result.kind === "no-seed" ? result.note : result.seed;
+        const seed = rawSeed.trim().length > 0 ? rawSeed : "No prior context could be carried forward.";
         sendForSpan({
           type: "compact-directive",
           directorSessionId: directorSessionId2,
           lineageId,
           resolvedSeat: compactionSeat.id,
-          seed
+          seed,
+          seedKind: result.kind
         });
         return;
       }
@@ -62626,6 +62655,17 @@ function compactProjectSnapshot(projectSlug, snapshot, maxItems) {
 }
 var ARTIFACT_PAYLOAD_BUDGET = 400;
 var COMMAND_OUTPUT_TAIL_LINES = 10;
+function asString(value) {
+  return typeof value === "string" ? value : null;
+}
+function eventContentText(value) {
+  if (typeof value === "string") return value;
+  if (value === null || typeof value !== "object") return null;
+  const blocks = Array.isArray(value) ? value : value.content;
+  if (!Array.isArray(blocks)) return null;
+  const texts = blocks.map((block) => block && typeof block === "object" ? asString(block.text) : null).filter((text) => text !== null);
+  return texts.length > 0 ? texts.join("\n") : null;
+}
 function compactArtifactPayload(artifact) {
   const payload = artifact.payload ?? {};
   switch (artifact.kind) {
@@ -62641,10 +62681,10 @@ function compactArtifactPayload(artifact) {
     }
     case "command_output": {
       const event = payload.event ?? void 0;
-      const command = payload.command ?? event?.tool?.input?.command ?? null;
-      const cwd = payload.cwd ?? event?.tool?.input?.cwd ?? null;
-      const exitCode = payload.exitCode ?? null;
-      const rawOutput = payload.stdout ?? payload.output ?? event?.content ?? "";
+      const command = asString(payload.command) ?? asString(event?.tool?.input?.command) ?? null;
+      const cwd = asString(payload.cwd) ?? asString(event?.tool?.input?.cwd) ?? null;
+      const exitCode = typeof payload.exitCode === "number" ? payload.exitCode : null;
+      const rawOutput = eventContentText(payload.stdout) ?? eventContentText(payload.output) ?? eventContentText(event?.content) ?? "";
       const lines2 = rawOutput.split(/\r?\n/);
       const tail2 = lines2.slice(-COMMAND_OUTPUT_TAIL_LINES).join("\n");
       const firstError = lines2.find((l) => /error|fail/i.test(l)) ?? null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/mcp",
-  "version": "0.4.28",
+  "version": "0.4.32",
   "type": "module",
   "bin": {
     "mrrlin-mcp": "dist/bin.cjs"
@@ -21,12 +21,12 @@
     "@types/ws": "^8.18.1",
     "esbuild": "^0.24.0",
     "tsx": "^4.22.3",
-    "@mrrlin/agent-client": "0.0.0",
-    "@mrrlin/director-e2e": "0.0.0",
     "@mrrlin/client": "0.0.0",
+    "@mrrlin/director-e2e": "0.0.0",
+    "@mrrlin/schemas": "0.0.0",
     "@mrrlin/tsconfig": "0.0.0",
-    "@mrrlin/wiki": "0.0.0",
-    "@mrrlin/schemas": "0.0.0"
+    "@mrrlin/agent-client": "0.0.0",
+    "@mrrlin/wiki": "0.0.0"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",