@retaw106/mmc-pi 2.0.0 → 2.1.0

package/dist/cli.js

@@ -4831,7 +4831,7 @@ class Parser {
       } else
         break;
     }
-    const expression = { steps, cap: 300 };
+    const expression = { steps };
     if (this.take(".each(")) {
       if (relative)
         return this.error();

package/dist/config-init.js

@@ -4849,7 +4849,7 @@ class Parser {
       } else
         break;
     }
-    const expression = { steps, cap: 300 };
+    const expression = { steps };
     if (this.take(".each(")) {
       if (relative)
         return this.error();

package/dist/{index-kxehmcmt.js → index-4n1w7ehq.js}

@@ -6,7 +6,7 @@ import {
 } from "./index-54cgx9gm.js";
 import {
   Database
-} from "./index-wv28nczk.js";
+} from "./index-ny303arh.js";
 
 // ../plugin/src/hooks/magic-context/tokenizer-calibration-seeds.json
 var tokenizer_calibration_seeds_default = [
@@ -2553,7 +2553,7 @@ function findPiFallbackToolOwnerTags(db, sessionId) {
                AND tool_owner_message_id LIKE 'pi-msg-%'
              ORDER BY tag_number ASC`).all(sessionId).filter(isPiFallbackToolOwnerTag);
 }
-function adoptPiFallbackToolOwnerTag(db, sessionId, tagNumber, callId, oldOwnerMessageId, newOwnerMessageId) {
+function adoptPiFallbackToolOwnerTag(db, sessionId, tagNumber, callId, oldOwnerMessageId, newOwnerMessageId, servedTagNumbers = new Set) {
   const survivor = getPiFallbackFoldTagRowByNumber(db, sessionId, tagNumber);
   if (survivor === null || survivor.type !== "tool" || survivor.messageId !== callId || survivor.toolOwnerMessageId !== oldOwnerMessageId) {
     return { action: "skipped" };
@@ -2572,6 +2572,14 @@ function adoptPiFallbackToolOwnerTag(db, sessionId, tagNumber, callId, oldOwnerM
   if (existing.tagNumber === tagNumber) {
     return { action: "skipped" };
   }
+  if (servedTagNumbers.has(survivor.tagNumber)) {
+    if (servedTagNumbers.has(existing.tagNumber)) {
+      throw new Error("Conflicting served Pi tool tag numbers; refusing identity adoption");
+    }
+    foldDuplicateIntoSurvivor(db, sessionId, survivor, existing);
+    db.prepare("UPDATE tags SET tool_owner_message_id = ? WHERE session_id = ? AND tag_number = ?").run(newOwnerMessageId, sessionId, tagNumber);
+    return { action: "folded", tagNumber, deletedTagNumbers: [existing.tagNumber] };
+  }
   foldDuplicateIntoSurvivor(db, sessionId, existing, survivor);
   return {
     action: "folded",
@@ -2579,7 +2587,7 @@ function adoptPiFallbackToolOwnerTag(db, sessionId, tagNumber, callId, oldOwnerM
     deletedTagNumbers: [tagNumber]
   };
 }
-function adoptPiFallbackMessageTag(db, sessionId, tagNumber, oldFallbackMessageId, newRealMessageId) {
+function adoptPiFallbackMessageTag(db, sessionId, tagNumber, oldFallbackMessageId, newRealMessageId, servedTagNumbers = new Set) {
   if (oldFallbackMessageId.startsWith(WHITESPACE_ASSISTANT_INERT_MESSAGE_PREFIX)) {
     return { action: "skipped" };
   }
@@ -2597,15 +2605,23 @@ function adoptPiFallbackMessageTag(db, sessionId, tagNumber, oldFallbackMessageI
                    AND message_id = ?`).run(newRealMessageId, sessionId, tagNumber, oldFallbackMessageId);
     return (result.changes ?? 0) > 0 ? { action: "rekeyed", tagNumber } : { action: "skipped" };
   }
-  const realSurvivor = duplicates[0];
+  const servedRows = [survivor, ...duplicates].filter((row) => servedTagNumbers.has(row.tagNumber));
+  if (servedRows.length > 1) {
+    throw new Error("Conflicting served Pi message tag numbers; refusing identity adoption");
+  }
+  const realSurvivor = servedRows[0] ?? duplicates[0];
   if (!realSurvivor)
     return { action: "skipped" };
-  const deletedTagNumbers = [tagNumber];
-  foldDuplicateIntoSurvivor(db, sessionId, realSurvivor, survivor);
-  for (const duplicate of duplicates.slice(1)) {
+  const deletedTagNumbers = [];
+  for (const duplicate of [survivor, ...duplicates]) {
+    if (duplicate.tagNumber === realSurvivor.tagNumber)
+      continue;
     foldDuplicateIntoSurvivor(db, sessionId, realSurvivor, duplicate);
     deletedTagNumbers.push(duplicate.tagNumber);
   }
+  if (realSurvivor.tagNumber === tagNumber) {
+    db.prepare("UPDATE tags SET message_id = ? WHERE session_id = ? AND tag_number = ?").run(newRealMessageId, sessionId, tagNumber);
+  }
   return {
     action: "folded",
     tagNumber: realSurvivor.tagNumber,
@@ -2892,6 +2908,20 @@ function pickNearestPriorOwner(candidates, currentMessageId, times) {
 }
 // ../plugin/src/shared/historian-tool-defaults.json
 var historian_tool_defaults_default = {
+  todowrite: 'Todos (${input.todos.count}): ${input.todos.each("${status}: ${content}")}',
+  question: 'Asked user: ${input.questions[*].question.join(" / ")} → ${output}',
+  task: "Task ${input.subagent_type}: ${input.prompt.truncate(600)} → ${output.truncate(200)}",
+  ask: 'Asked: ${input.question} [options: ${input.options.join(" / ")}] ${input.text}${input.resolution} → ${output.truncate(300)}',
+  peer_send: "PM ${input.recipient}: ${input.message}",
+  board: 'Board ${input.verb}${input.board_lane}: ${input.ops.each("${op} ${lane_label} ${item}${props.text}${lane.items} ${state}${props.state}${lane.status}${id}${title}")}',
+  room: "Room ${input.action} ${input.room_label}: ${input.room_detail}",
+  work: "Work ${input.action} ${input.title}${input.id}: ${input.prompt.truncate(600)}${input.notes.truncate(600)} → ${output.truncate(160)}",
+  knowhow: "Looked up how-to: ${input.query}${input.id}",
+  mmc_note: "Note ${input.action} ${input.note_ids}: ${input.content} → ${output.truncate(160)}",
+  mmc_memory: "Memory ${input.action} ${input.category} ${input.ids}: ${input.content} → ${output.truncate(160)}"
+};
+// ../plugin/src/shared/historian-tool-preview-defaults.json
+var historian_tool_preview_defaults_default = {
   todowrite: 'Todos (${input.todos.count}): ${input.todos.each("${status}: ${content}")}',
   question: 'Asked user: ${input.questions[*].question.join(" / ")} → ${output}',
   task: "Task ${input.subagent_type}: ${input.prompt} → ${output.truncate(200)}",
@@ -2984,7 +3014,7 @@ class Parser {
       } else
         break;
     }
-    const expression = { steps, cap: 300 };
+    const expression = { steps };
     if (this.take(".each(")) {
       if (relative)
         return this.error();
@@ -3051,9 +3081,23 @@ function compiled(source) {
 function oneLine(value) {
   return value.replace(/[\r\n\u2028\u2029]+/g, " ");
 }
-function truncate(value, cap) {
+function truncate(value, cap, legacyPreview = false) {
   const chars = Array.from(oneLine(value));
-  return chars.length > cap ? `${chars.slice(0, cap).join("")}…` : chars.join("");
+  if (cap === undefined || chars.length <= cap)
+    return chars.join("");
+  if (legacyPreview)
+    return `${chars.slice(0, cap).join("")}…`;
+  let end = 0;
+  for (let i = 0;i < Math.min(cap, chars.length); i++) {
+    if (!".!?。！？".includes(chars[i]))
+      continue;
+    let next = i + 1;
+    while (next < chars.length && `"'”’)]`.includes(chars[next]))
+      next++;
+    if (next <= cap && ("。！？".includes(chars[i]) || next === chars.length || /[ \t]/.test(chars[next])))
+      end = next;
+  }
+  return `${end ? `${chars.slice(0, end).join("")} ` : ""}[… ${chars.length - end} more characters]`;
 }
 function scalar(value) {
   if (value === undefined)
@@ -3070,10 +3114,11 @@ function compactJson(value) {
 function field(value, key) {
   return value !== null && typeof value === "object" && !Array.isArray(value) && Object.hasOwn(value, key) ? value[key] : undefined;
 }
-function render(nodes, root) {
+function render(nodes, root, legacyPreview) {
   return nodes.map((node) => {
     if (typeof node === "string")
       return node;
+    const cap = node.cap ?? (legacyPreview ? 300 : undefined);
     let value = root;
     let list = false;
     for (const step of node.steps) {
@@ -3087,19 +3132,19 @@ function render(nodes, root) {
       }
     }
     if (node.count)
-      return truncate(Array.isArray(value) ? String(value.length) : "", node.cap);
+      return truncate(Array.isArray(value) ? String(value.length) : "", cap, legacyPreview);
     if (node.each || list || node.join !== undefined) {
       if (!Array.isArray(value))
         return "";
-      const elements = value.slice(0, 10).map((item) => truncate(node.each ? render(node.each, item) : scalar(item), 300));
-      if (value.length > 10)
+      const elements = value.slice(0, legacyPreview ? 10 : undefined).map((item) => truncate(node.each ? render(node.each, item, legacyPreview) : scalar(item), legacyPreview ? 300 : undefined, legacyPreview));
+      if (legacyPreview && value.length > 10)
         elements.push(`… +${value.length - 10} more`);
-      return truncate(elements.join(node.join ?? (node.each ? "; " : ", ")), node.cap);
+      return truncate(elements.join(node.join ?? (node.each ? "; " : ", ")), cap, legacyPreview);
     }
-    return truncate(scalar(value), node.cap);
+    return truncate(scalar(value), cap, legacyPreview);
   }).join("");
 }
-function renderToolTemplate(source, input, output) {
+function renderToolTemplate(source, input, output, legacyPreview = false) {
   const nodes = compiled(source);
   if (!nodes)
     return null;
@@ -3114,22 +3159,53 @@ function renderToolTemplate(source, input, output) {
     }
   }
   const root = { input, output: structured };
-  const bareOutputNodes = nodes.map((node) => typeof node !== "string" && node.steps.length === 1 && ("field" in node.steps[0]) && node.steps[0].field === "output" && !node.each && !node.count && node.join === undefined ? truncate(text ?? "", node.cap) : node);
-  return truncate(render(bareOutputNodes, root), 1000);
+  const bareOutputNodes = nodes.map((node) => typeof node !== "string" && node.steps.length === 1 && ("field" in node.steps[0]) && node.steps[0].field === "output" && !node.each && !node.count && node.join === undefined ? truncate(text ?? "", node.cap ?? (legacyPreview ? 300 : undefined), legacyPreview) : node);
+  return truncate(render(bareOutputNodes, root, legacyPreview), legacyPreview ? 1000 : undefined, legacyPreview);
 }
 
 // ../plugin/src/shared/historian-tool-expansions.ts
-function expandToolPart(part, overrides) {
+function builtinInput(tool, input) {
+  if (!input || typeof input !== "object")
+    return input;
+  const i = input;
+  if (tool === "peer_send") {
+    const external = i.external;
+    const recipient = i.reply_to_pmid ? `reply to ${i.reply_to_pmid}` : i.agent || i.agent_id ? `to ${i.agent || i.agent_id}` : external?.session_id || i.session_id ? `to session ${external?.session_id || i.session_id}` : "to unknown recipient";
+    return { ...i, recipient };
+  }
+  if (tool === "room") {
+    return {
+      ...i,
+      room_label: i.room_id || i.title,
+      room_detail: i.action === "create" || i.action === "invite" ? `invitees: ${renderToolTemplate("${input.invitees}", i)}` : i.text
+    };
+  }
+  if (tool === "board") {
+    return {
+      ...i,
+      board_lane: i.lane ? ` ${i.lane}` : "",
+      ops: Array.isArray(i.ops) ? i.ops.map((op) => op && typeof op === "object" ? {
+        ...op,
+        lane_label: typeof op.lane === "string" ? op.lane : op.lane?.title || op.lane?.id
+      } : op) : i.ops
+    };
+  }
+  return input;
+}
+function expandToolPart(part, overrides, legacyPreview = false) {
   if (!part || typeof part !== "object")
     return null;
   const p = part;
   if (p.type !== "tool" || typeof p.tool !== "string")
     return null;
-  const template = overrides && Object.hasOwn(overrides, p.tool) ? overrides[p.tool] : Object.hasOwn(historian_tool_defaults_default, p.tool) ? historian_tool_defaults_default[p.tool] : undefined;
+  const builtinDefaults = legacyPreview ? historian_tool_preview_defaults_default : historian_tool_defaults_default;
+  const overridden = overrides && Object.hasOwn(overrides, p.tool);
+  const template = overridden ? overrides[p.tool] : Object.hasOwn(builtinDefaults, p.tool) ? builtinDefaults[p.tool] : undefined;
   if (typeof template !== "string")
     return null;
   const state = p.state;
-  return renderToolTemplate(template, state?.input, state?.output ?? state?.error);
+  const input = overridden || legacyPreview ? state?.input : builtinInput(p.tool, state?.input);
+  return renderToolTemplate(template, input, state?.output ?? state?.error, legacyPreview);
 }
 
 // ../plugin/src/hooks/magic-context/host-served-rows.ts
@@ -4121,20 +4197,22 @@ function fenceBoundaryForCompletedToolArcs(candidate, arcs, publicationFloorOrdi
   return minInvocation < publicationFloorOrdinal ? maxResult + 1 : minInvocation;
 }
 function fenceBoundaryForToolArcs(candidate, arcs, lastCompartmentEndOrdinal, recentOpenArcCutoff) {
-  const boundary = fenceBoundaryForCompletedToolArcs(candidate, arcs, lastCompartmentEndOrdinal + 1);
+  let boundary = fenceBoundaryForCompletedToolArcs(candidate, arcs, lastCompartmentEndOrdinal + 1);
   for (const arc of arcs) {
     if (arc.resOrdinal !== null)
       continue;
     if (arc.invOrdinal < recentOpenArcCutoff)
       continue;
     if (arc.invOrdinal >= lastCompartmentEndOrdinal + 1 && arc.invOrdinal < boundary) {
-      return arc.invOrdinal;
+      boundary = arc.invOrdinal;
+      break;
     }
     if (arc.invOrdinal >= boundary) {
-      return arc.invOrdinal;
+      boundary = arc.invOrdinal;
+      break;
     }
   }
-  return boundary;
+  return fenceBoundaryForCompletedToolArcs(boundary, arcs, 1);
 }
 function tokenForMessage(message, options) {
   const key = messageCacheKey(message, options);
@@ -4651,7 +4729,8 @@ function detectThinkingBindingMismatch(error) {
 var PREFIX_BOUND_THINKING_MODELS = [
   ["fable", 5, 1],
   ["opus", 5, 5],
-  ["sonnet", 5, 5]
+  ["sonnet", 5, 5],
+  ["haiku", 5, 5]
 ];
 var PREFIX_BOUND_THINKING_PATTERN = new RegExp(`(?:^|[-_.:/])(?:${PREFIX_BOUND_THINKING_MODELS.map(([family, major, minor]) => `${family}[-_.]?${major}[-_.]${minor}`).join("|")})(?:$|[-_.:/@])`, "i");
 function isPrefixBoundThinkingModel(_providerID, modelID) {

package/dist/{index-wv28nczk.js → index-ny303arh.js}

@@ -69,6 +69,8 @@ function installTransactionRouting(db, readonly) {
     configurable: true,
     writable: true,
     value: (sql) => {
+      if (/^\s*(?:COMMIT|END)\b/i.test(sql))
+        assertTransformWrite();
       if (/^\s*BEGIN\s+(?:IMMEDIATE|EXCLUSIVE)(?:\s+TRANSACTION)?\s*;?\s*$/i.test(sql)) {
         openWriterTransactions.delete(db);
         if (transformPassScope.getStore()?.active || backgroundWriterScope.getStore())
@@ -221,6 +223,15 @@ function pragmaNumber(db, name) {
 }
 var statementOwners = new WeakMap;
 var FIRST_PRUNE_AT = 256;
+function closeReleasingStatements(close, args) {
+  if (args[0] === true)
+    return close(true);
+  try {
+    return close(true);
+  } catch {
+    return close(...args);
+  }
+}
 function ownPreparedStatement(db, statement) {
   const finalizable = statement;
   if (typeof finalizable.finalize !== "function")
@@ -244,7 +255,7 @@ function ownPreparedStatement(db, statement) {
           }
         }
         references.clear();
-        const result = close(...args);
+        const result = closeReleasingStatements(close, args);
         if (failure)
           throw failure;
         return result;
@@ -298,6 +309,15 @@ function withSqliteTransformPass(operation) {
 function withoutSqliteTransformPass(operation) {
   return transformPassScope.run(undefined, operation);
 }
+function guardSqliteTransformPass(guard) {
+  const lease = transformPassScope.getStore();
+  if (lease)
+    lease.guard = guard;
+}
+function assertTransformWrite() {
+  if (!backgroundWriterScope.getStore())
+    transformPassScope.getStore()?.guard?.assert();
+}
 function isTransientSqliteError(error) {
   if (!error || typeof error !== "object")
     return false;
@@ -316,6 +336,7 @@ class SqliteAcquisitionBusyError extends Error {
 }
 var SHORT_BUSY_TIMEOUT_MS = 25;
 var FOREGROUND_IN_PASS_BUSY_TIMEOUT_MS = 250;
+var FOREGROUND_ACQUISITION_BUDGET_MS = 16500;
 var SLOW_WRITER_LOG_MS = 250;
 var WRITER_TRANSACTION_END = /^\s*(?:COMMIT|END|ROLLBACK)(?:\s+TRANSACTION)?\s*;?\s*$/i;
 var writerAcquisitionScope = new AsyncLocalStorage;
@@ -325,6 +346,7 @@ function foregroundWaitLease() {
   return lease?.active && !admissionScope.getStore() && !backgroundWriterScope.getStore() ? lease : undefined;
 }
 function withAutocommitTimeout(db, operation) {
+  assertTransformWrite();
   const lease = foregroundWaitLease();
   if (isInTransaction(db) || !lease && !backgroundWriterScope.getStore())
     return operation();
@@ -345,6 +367,7 @@ function withAutocommitTimeout(db, operation) {
   }
 }
 function acquireShort(db, acquire, site) {
+  assertTransformWrite();
   const started = performance.now();
   const previous = pragmaNumber(db, "busy_timeout");
   const outer = writerAcquisitionScope.getStore();
@@ -356,7 +379,7 @@ function acquireShort(db, acquire, site) {
   let acquiredAt;
   try {
     const lease = foregroundWaitLease();
-    const timeout = lease ? Math.floor(lease.remainingWaitMs) : SHORT_BUSY_TIMEOUT_MS;
+    const timeout = Math.floor(Math.min(lease ? lease.remainingWaitMs : SHORT_BUSY_TIMEOUT_MS, owner?.remainingMs?.() ?? lease?.guard?.remainingMs() ?? Infinity));
     db.exec(`PRAGMA busy_timeout=${timeout}`);
     acquire();
     acquiredAt = performance.now();
@@ -402,6 +425,56 @@ function endWriterTransaction(db, end, sql) {
     }
   }
 }
+async function withAsyncPrivilegedWriter(db, operation, options = {}) {
+  const started = performance.now();
+  const budgetMs = Math.max(0, Math.min(FOREGROUND_ACQUISITION_BUDGET_MS, options.budgetMs ?? Infinity));
+  let attempts = 0;
+  for (;; ) {
+    options.signal?.throwIfAborted();
+    options.assertCurrentPass?.();
+    attempts++;
+    let entered = false;
+    try {
+      const acquisition = {
+        site: "privileged_writer",
+        lane: "foreground",
+        startedAt: started,
+        attempts,
+        claimed: false,
+        remainingMs: () => Math.max(0, budgetMs - (performance.now() - started))
+      };
+      return admissionScope.run(true, () => withSqliteTransformPass(() => writerAcquisitionScope.run(acquisition, () => withPrivilegedWriter(db, () => {
+        entered = true;
+        return operation();
+      }))));
+    } catch (error) {
+      if (entered || !(error instanceof SqliteAcquisitionBusyError))
+        throw error;
+      options.beforeRetry?.(error);
+      const elapsed = performance.now() - started;
+      if (elapsed >= budgetMs) {
+        reportSqliteDiagnostic(`sqlite writer site=privileged_writer lane=foreground acquire_ms=${Math.round(elapsed)} attempts=${attempts} outcome=busy`);
+        throw error;
+      }
+      const backoff = attempts === 1 ? 500 : 1000;
+      const delay = Math.min(options.jitter ? backoff * (0.8 + Math.random() * 0.4) : backoff, budgetMs - elapsed);
+      await new Promise((resolve, reject) => {
+        const abort = () => {
+          clearTimeout(timer);
+          options.signal?.removeEventListener("abort", abort);
+          reject(options.signal?.reason ?? new Error("Writer wait aborted"));
+        };
+        const timer = setTimeout(() => {
+          options.signal?.removeEventListener("abort", abort);
+          resolve();
+        }, delay);
+        options.signal?.addEventListener("abort", abort, { once: true });
+        if (options.signal?.aborted)
+          abort();
+      });
+    }
+  }
+}
 function isInTransaction(db) {
   const candidate = db;
   return candidate.inTransaction === true || candidate.isTransaction === true;
@@ -461,4 +534,4 @@ function withPrivilegedWriter(db, operation) {
   }
 }
 
-export { registerSlowWriteReporter, registerSqliteDiagnosticSink, detectSqliteRuntime, Database, prepareCachedStatement, withSqliteBackgroundWriter, withSqliteTransformPass, withoutSqliteTransformPass, isTransientSqliteError, withPrivilegedWriter };
+export { registerSlowWriteReporter, registerSqliteDiagnosticSink, detectSqliteRuntime, Database, prepareCachedStatement, withSqliteBackgroundWriter, withSqliteTransformPass, withoutSqliteTransformPass, guardSqliteTransformPass, isTransientSqliteError, withAsyncPrivilegedWriter, withPrivilegedWriter };