@retaw106/mmc-pi 2.4.0 → 2.6.0

package/dist/{message-time-backfill-fvkrfyp4.js → message-time-backfill-y26yy5pp.js}

@@ -1,7 +1,7 @@
 import {
   withSqliteBackgroundWriter,
   withoutSqliteTransformPass
-} from "./index-cr4hzd76.js";
+} from "./index-vhs0y3s0.js";
 import"./index-83p1tc98.js";
 import {
   logSlowWriteTransaction

package/dist/{read-session-chunk-g164kwxz.js → read-session-chunk-qg5jfqjg.js}

@@ -24,8 +24,8 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-zmx631ey.js";
-import"./index-cr4hzd76.js";
+} from "./index-07rh0nr2.js";
+import"./index-vhs0y3s0.js";
 import"./index-83p1tc98.js";
 export {
   cleanUserText2 as cleanUserText,

package/dist/web/main.js

@@ -572,6 +572,174 @@ function topLevelCommaSegments(text) {
   segments.push(text.slice(start));
   return segments;
 }
+function literalBusyTimeout(sql) {
+  const head = BUSY_TIMEOUT_SETTER.exec(sql);
+  if (!head)
+    return;
+  const match = /^(?:=\s*|\(\s*)(?:'(-?\d+)'|"(-?\d+)"|(-?\d+))\s*\)?\s*;?\s*$/.exec(sql.slice(head[0].length));
+  if (!match)
+    return;
+  const value = Number(match[1] ?? match[2] ?? match[3]);
+  return value < 0 ? 0 : value <= 2147483647 ? value : undefined;
+}
+function busyTimeoutStatements(sql) {
+  const statements = [];
+  let statement = "";
+  let quote = "";
+  for (let i = 0;i < sql.length; i++) {
+    const char = sql[i];
+    if (quote) {
+      statement += char;
+      if (char === quote) {
+        if (sql[i + 1] === quote)
+          statement += sql[++i];
+        else
+          quote = "";
+      }
+    } else if (char === "'" || char === '"' || char === "`" || char === "[") {
+      quote = char === "[" ? "]" : char;
+      statement += char;
+    } else if (char === "-" && sql[i + 1] === "-") {
+      while (i + 1 < sql.length && sql[i + 1] !== `
+`)
+        i++;
+      statement += " ";
+    } else if (char === "/" && sql[i + 1] === "*") {
+      i += 2;
+      while (i < sql.length && !(sql[i] === "*" && sql[i + 1] === "/"))
+        i++;
+      i++;
+      statement += " ";
+    } else if (char === ";") {
+      statements.push(statement);
+      statement = "";
+    } else
+      statement += char;
+  }
+  statements.push(statement);
+  return statements.filter((part) => part.trim().length > 0);
+}
+function installNativeDeadlineRouting(db) {
+  const rawExec = db.exec.bind(db);
+  const rawPrepare = db.prepare.bind(db);
+  const readTimeout = () => {
+    const statement = rawPrepare("PRAGMA busy_timeout");
+    try {
+      return Object.values(statement.get())[0];
+    } finally {
+      statement.finalize?.();
+    }
+  };
+  const timeoutState = { current: readTimeout() };
+  busyTimeoutStates.set(db, timeoutState);
+  const setBusyTimeout = (timeout) => {
+    rawExec(`PRAGMA busy_timeout=${timeout}`);
+    timeoutState.current = timeout;
+  };
+  const withinDeadline = (operation) => {
+    const deadline = nativeWaitScope?.getStore();
+    if (!deadline?.active || !deadline.remainingMs)
+      return operation();
+    const remaining = deadline.remainingMs();
+    if (remaining === Infinity)
+      return operation();
+    const previous = timeoutState.current;
+    const timeout = Math.min(previous, Math.max(0, Math.floor(remaining)));
+    if (timeout === previous)
+      return operation();
+    setBusyTimeout(timeout);
+    try {
+      return operation();
+    } finally {
+      setBusyTimeout(previous);
+    }
+  };
+  Object.defineProperty(db, "exec", {
+    configurable: true,
+    writable: true,
+    value: (sql) => {
+      const parts = /\bbusy_timeout\b/i.test(sql) ? busyTimeoutStatements(sql) : [];
+      if (parts.length === 1 && BUSY_TIMEOUT_QUERY.test(parts[0]))
+        return rawExec(sql);
+      const singleSetter = parts.length === 1 && BUSY_TIMEOUT_SETTER.test(parts[0]);
+      const setting = singleSetter ? literalBusyTimeout(parts[0]) : undefined;
+      if (singleSetter) {
+        const result = rawExec(sql);
+        timeoutState.current = setting ?? readTimeout();
+        return result;
+      }
+      if (!/\bbusy_timeout\b/i.test(sql))
+        return withinDeadline(() => rawExec(sql));
+      const setters = parts.filter((part) => BUSY_TIMEOUT_SETTER.test(part));
+      return withinDeadline(() => {
+        try {
+          const result = rawExec(sql);
+          if (setters.length)
+            timeoutState.current = literalBusyTimeout(setters[setters.length - 1]) ?? readTimeout();
+          return result;
+        } catch (error) {
+          if (setters.length)
+            timeoutState.current = readTimeout();
+          throw error;
+        }
+      });
+    }
+  });
+  const nativePrepare = (sql) => BUSY_TIMEOUT_QUERY.test(sql) || BUSY_TIMEOUT_SETTER.test(sql) ? rawPrepare(sql) : withinDeadline(() => rawPrepare(sql));
+  Object.defineProperty(db, "prepare", {
+    configurable: true,
+    writable: true,
+    value: (sql) => {
+      const statement = nativePrepare(sql);
+      const normalized = /\bbusy_timeout\b/i.test(sql) ? busyTimeoutStatements(sql)[0] ?? sql : sql;
+      const setting = literalBusyTimeout(normalized);
+      const timeoutSetter = BUSY_TIMEOUT_SETTER.test(normalized);
+      const timeoutQuery = BUSY_TIMEOUT_QUERY.test(normalized);
+      if (timeoutSetter)
+        timeoutState.current = setting ?? readTimeout();
+      for (const method of ["run", "get", "all", "values"]) {
+        const execute = statement[method]?.bind(statement);
+        if (!execute)
+          continue;
+        Object.defineProperty(statement, method, {
+          configurable: true,
+          value: (...args) => {
+            if (timeoutQuery)
+              return execute(...args);
+            if (!timeoutSetter)
+              return withinDeadline(() => execute(...args));
+            const result = execute(...args);
+            timeoutState.current = readTimeout();
+            return result;
+          }
+        });
+      }
+      if (typeof statement.iterate === "function") {
+        const iterate = statement.iterate.bind(statement);
+        Object.defineProperty(statement, "iterate", {
+          configurable: true,
+          value: (...args) => {
+            const iterator = !timeoutSetter && !timeoutQuery ? withinDeadline(() => iterate(...args)) : iterate(...args);
+            const next = iterator.next.bind(iterator);
+            if (timeoutSetter)
+              timeoutState.current = readTimeout();
+            iterator.next = () => {
+              if (timeoutQuery)
+                return next();
+              if (!timeoutSetter)
+                return withinDeadline(next);
+              const result = next();
+              timeoutState.current = readTimeout();
+              return result;
+            };
+            return iterator;
+          }
+        });
+      }
+      return statement;
+    }
+  });
+}
 function installTransactionRouting(db, readonly) {
   const nativeExec = db.exec.bind(db);
   Object.defineProperty(db, "exec", {
@@ -709,7 +877,7 @@ function wrapRemainingTagWriteForms(statement) {
     });
   }
 }
-function trackSqliteConnection(db, filename, options) {
+function trackSqliteConnection(db, filename, options, turnDeadlines = false) {
   const originalClose = db.close.bind(db);
   const sequence = nextSqliteConnectionSequence++;
   const metadata = {
@@ -717,6 +885,8 @@ function trackSqliteConnection(db, filename, options) {
     filename: typeof filename === "string" ? filename : Buffer.isBuffer(filename) ? "<buffer>" : ":memory:",
     readonly: Boolean(options) && typeof options === "object" && (options.readonly === true || options.readOnly === true)
   };
+  if (turnDeadlines)
+    installNativeDeadlineRouting(db);
   installTransactionRouting(db, metadata.readonly);
   Object.defineProperty(db, "close", {
     configurable: true,
@@ -769,6 +939,11 @@ function pragmaValue(db, name) {
   return row[name] ?? Object.values(row)[0];
 }
 function pragmaNumber(db, name) {
+  if (name === "busy_timeout") {
+    const state = busyTimeoutStates.get(db);
+    if (state)
+      return state.current;
+  }
   try {
     const value = pragmaValue(db, name);
     return typeof value === "number" && Number.isFinite(value) ? value : null;
@@ -957,7 +1132,7 @@ function isInTransaction(db) {
   const candidate = db;
   return candidate.inTransaction === true || candidate.isTransaction === true;
 }
-var resourceRoot, reportSlowPrivilegedWrite, sqliteDiagnosticSink, sqliteDiagnosticHost = () => "unknown", bunSpec, nodeSpec, SqliteRuntimeUnavailableError, detectedRuntime, isBun, sqliteModule, DatabaseImpl, trackedSqliteConnections, nextSqliteConnectionSequence = 1, TAG_COLUMNS_OUTSIDE_IDENTITY, tagIdentityWriteGeneration = 0, TrackedDatabase, Database, statementOwners, FIRST_PRUNE_AT = 256, privilegeDepth, transformPassScope, admissionScope, backgroundWriterScope, SqliteAcquisitionBusyError, SHORT_BUSY_TIMEOUT_MS = 25, SLOW_WRITER_LOG_MS = 100, WRITER_TRANSACTION_END, writerAcquisitionScope, openWriterTransactions, indexCoordinationKey, indexCoordinationHeap, indexCoordinationBuffer, indexCoordinationState;
+var resourceRoot, reportSlowPrivilegedWrite, sqliteDiagnosticSink, sqliteDiagnosticHost = () => "unknown", bunSpec, nodeSpec, SqliteRuntimeUnavailableError, detectedRuntime, isBun, sqliteModule, DatabaseImpl, trackedSqliteConnections, nextSqliteConnectionSequence = 1, TAG_COLUMNS_OUTSIDE_IDENTITY, tagIdentityWriteGeneration = 0, busyTimeoutStates, BUSY_TIMEOUT_QUERY, BUSY_TIMEOUT_SETTER, TrackedDatabase, Database, statementOwners, FIRST_PRUNE_AT = 256, privilegeDepth, nativeWaitScope, transformPassScope, admissionScope, backgroundWriterScope, SqliteAcquisitionBusyError, SHORT_BUSY_TIMEOUT_MS = 25, SLOW_WRITER_LOG_MS = 100, WRITER_TRANSACTION_END, writerAcquisitionScope, openWriterTransactions, indexCoordinationKey, indexCoordinationHeap, indexCoordinationBuffer, indexCoordinationState;
 var init_sqlite = __esm(async () => {
   resourceRoot = new AsyncResource("magic-context:root");
   bunSpec = "bun:" + "sqlite";
@@ -991,6 +1166,9 @@ var init_sqlite = __esm(async () => {
     "tool_name",
     "harness"
   ]);
+  busyTimeoutStates = new WeakMap;
+  BUSY_TIMEOUT_QUERY = /^\s*PRAGMA\s+(?:(?:\w+|"[^"]+"|`[^`]+`|\[[^\]]+\])\s*\.\s*)?(?:busy_timeout|"busy_timeout"|`busy_timeout`|\[busy_timeout\])\s*;?\s*$/i;
+  BUSY_TIMEOUT_SETTER = /^\s*PRAGMA\s+(?:(?:\w+|"[^"]+"|`[^`]+`|\[[^\]]+\])\s*\.\s*)?(?:busy_timeout|"busy_timeout"|`busy_timeout`|\[busy_timeout\])\s*(?==|\()/i;
   TrackedDatabase = new Proxy(DatabaseImpl, {
     construct(target, args) {
       const db = inRootAsyncContext(() => Reflect.construct(target, args, target));
@@ -1181,12 +1359,58 @@ var init_read_session_formatting = __esm(() => {
   promptTokenCounts = new Map;
   PROMPT_TOKEN_COUNT_BYTES = 8 * 1024 * 1024;
 });
+
+// ../plugin/src/shared/bounded-session-map.ts
+class BoundedSessionMap {
+  maxEntries;
+  store = new Map;
+  constructor(maxEntries) {
+    if (!Number.isFinite(maxEntries) || maxEntries < 1) {
+      throw new Error(`BoundedSessionMap: maxEntries must be >= 1, got ${maxEntries}`);
+    }
+    this.maxEntries = maxEntries;
+  }
+  get(sessionId) {
+    const value = this.store.get(sessionId);
+    if (value === undefined)
+      return;
+    this.store.delete(sessionId);
+    this.store.set(sessionId, value);
+    return value;
+  }
+  peek(sessionId) {
+    return this.store.get(sessionId);
+  }
+  has(sessionId) {
+    return this.store.has(sessionId);
+  }
+  set(sessionId, value) {
+    if (this.store.has(sessionId)) {
+      this.store.delete(sessionId);
+    } else if (this.store.size >= this.maxEntries) {
+      const oldest = this.store.keys().next().value;
+      if (oldest !== undefined)
+        this.store.delete(oldest);
+    }
+    this.store.set(sessionId, value);
+  }
+  delete(sessionId) {
+    return this.store.delete(sessionId);
+  }
+  clear() {
+    this.store.clear();
+  }
+  get size() {
+    return this.store.size;
+  }
+}
 // ../plugin/src/features/magic-context/tool-definition-tokens.ts
-var measurements, fingerprints;
+var ACTIVITY_WINDOW_MS, routes, sessionFlights;
 var init_tool_definition_tokens = __esm(() => {
   init_read_session_formatting();
-  measurements = new Map;
-  fingerprints = new Map;
+  ACTIVITY_WINDOW_MS = 10 * 60000;
+  routes = new Map;
+  sessionFlights = new BoundedSessionMap(1000);
 });
 
 // ../plugin/src/shared/opencode-db-path.ts
@@ -4436,6 +4660,13 @@ function closeConnection(connection) {
     counters.readersClosed += 1;
   }
 }
+function messageTimesQuery(count, withVersions = false) {
+  return `SELECT id, COALESCE(time_created, json_extract(data, '$.time.created')) AS created,
+                   json_extract(data, '$.time.completed') AS completed
+                   ${withVersions ? ", type, seq, time_created AS version_created, time_updated AS version_updated" : ""}
+            FROM session_message WHERE +session_id = ? AND id IN (${Array.from({ length: count }, () => "?").join(",")})`;
+}
+
 class V2StoreReader {
   path;
   pool;
@@ -4531,6 +4762,12 @@ class V2StoreReader {
       return typeof row?.count === "number" ? row.count : 0;
     });
   }
+  messageCountAfterSequence(sessionID, after, through) {
+    const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
+    const row = this.prepare(`SELECT COUNT(*) AS count FROM session_message
+             WHERE session_id = ? AND seq > ? AND seq <= ? AND type IN (${rawTypes})`).get(sessionID, after, through, ...RAW_MESSAGE_TYPES);
+    return typeof row?.count === "number" ? row.count : 0;
+  }
   sessionDirectoryPage(afterSessionID, limit) {
     const rows = this.prepare(`SELECT id, COALESCE(directory, '') AS directory FROM session_v2
                  WHERE id > ? ORDER BY id ASC LIMIT ?`).all(afterSessionID ?? "", limit);
@@ -4564,6 +4801,49 @@ class V2StoreReader {
       return row ? decode(row) : null;
     });
   }
+  messageTimeVersions(sessionID, ids, span) {
+    const versions = new Map;
+    if (ids.length > 0 && span && span.last - span.first < ids.length * 2) {
+      const wanted = new Set(ids);
+      const rows = this.prepare(`SELECT id, type, seq, time_created AS created, time_updated AS updated
+                FROM session_message WHERE session_id = ? AND seq >= ? AND seq <= ?`).all(sessionID, span.first, span.last);
+      for (const row of rows)
+        if (wanted.has(row.id))
+          versions.set(row.id, row);
+      for (const [id, version] of this.messageTimeVersions(sessionID, ids.filter((id) => !versions.has(id))))
+        versions.set(id, version);
+      return versions;
+    }
+    for (let offset = 0;offset < ids.length; offset += 500) {
+      const batch = ids.slice(offset, offset + 500);
+      const rows = this.prepare(`SELECT id, type, seq, time_created AS created, time_updated AS updated
+                FROM session_message WHERE +session_id = ? AND id IN (${batch.map(() => "?").join(",")})`).all(sessionID, ...batch);
+      for (const row of rows)
+        versions.set(row.id, row);
+    }
+    return versions;
+  }
+  messageTimes(sessionID, ids, versions) {
+    const times = new Map;
+    for (let offset = 0;offset < ids.length; offset += 500) {
+      const batch = ids.slice(offset, offset + 500);
+      const rows = this.prepare(messageTimesQuery(batch.length, versions !== undefined)).all(sessionID, ...batch);
+      for (const row of rows) {
+        times.set(row.id, {
+          created: typeof row.created === "number" ? row.created : undefined,
+          completed: typeof row.completed === "number" ? row.completed : undefined
+        });
+        versions?.set(row.id, {
+          id: row.id,
+          type: row.type,
+          seq: row.seq,
+          created: row.version_created,
+          updated: row.version_updated
+        });
+      }
+    }
+    return times;
+  }
   messageExistsById(sessionID, id) {
     return trackDecodeOperation("messageExistsById", () => {
       const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
@@ -4649,6 +4929,14 @@ class V2StoreReader {
                          ORDER BY seq DESC LIMIT ?`).all(sessionID, ...RAW_MESSAGE_TYPES, throughSeq, limit).map(decode);
     });
   }
+  instructionRowsThrough(sessionID, throughSeq) {
+    return trackDecodeOperation("instructionRowsThrough", () => {
+      if (!Number.isSafeInteger(throughSeq))
+        throw new Error("Invalid seq upper bound");
+      return this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
+                     WHERE session_id = ? AND type = 'system' AND seq <= ? ORDER BY seq ASC`).all(sessionID, throughSeq).map(decode);
+    });
+  }
   sequenceForId(sessionID, id) {
     if (!id)
       return;
@@ -5322,24 +5610,31 @@ ${data.output?.output ?? ""}`
   const sameModel = sameProvider && previousModel?.id === model.id;
   const reuse = sameModel && data.error === undefined;
   const metadata = (state) => state === undefined ? undefined : { [model.providerID]: state };
+  const reasoningInterrupted = data.content?.some((part) => part.type === "reasoning" && part.time !== undefined && part.time.completed === undefined);
   const content = [];
   const results = [];
   for (const part of data.content ?? []) {
+    let native = "native" in part ? part.native : part.type === "tool" ? part.providerState : part.state;
+    if (part.type === "tool" && part.providerResultState !== null && typeof part.providerResultState === "object" && !Array.isArray(part.providerResultState))
+      native = {
+        ...native !== null && typeof native === "object" && !Array.isArray(native) ? native : {},
+        ...part.providerResultState
+      };
     if (part.type === "text") {
       if (part.text !== "")
         content.push({
           type: "text",
           text: part.text,
-          providerMetadata: reuse ? metadata(part.state) : undefined
+          providerMetadata: reuse ? metadata(native) : undefined
         });
       continue;
     }
     if (part.type === "reasoning") {
-      if (part.text !== "" || reuse && part.state !== undefined)
+      if (part.text !== "" || reuse && !reasoningInterrupted && native !== undefined)
         content.push({
-          type: reuse || data.error === undefined ? "reasoning" : "text",
+          type: data.error === undefined && !reasoningInterrupted ? "reasoning" : "text",
           text: part.text,
-          providerMetadata: reuse ? metadata(part.state) : undefined
+          providerMetadata: reuse && !reasoningInterrupted ? metadata(native) : undefined
         });
       continue;
     }
@@ -5358,7 +5653,7 @@ ${data.output?.output ?? ""}`
       name: part.name,
       input,
       providerExecuted: part.executed,
-      providerMetadata: toolReuse ? metadata(part.providerState) : undefined
+      providerMetadata: toolReuse ? metadata(native) : undefined
     });
     if (!completed)
       continue;
@@ -5369,7 +5664,7 @@ ${data.output?.output ?? ""}`
       id: part.id,
       name: part.name,
       providerExecuted: part.executed,
-      providerMetadata: toolReuse ? metadata(part.providerResultState ?? part.providerState) : sameProvider ? metadata(part.providerResultState) : undefined,
+      providerMetadata: (part.executed === true ? sameProvider : reuse) ? metadata(native) : undefined,
       result: state.status === "error" ? { error: state.error, content: toolContent } : single?.type === "text" ? { type: "text", value: single.text } : { type: "content", value: toolContent },
       ...state.status === "error" ? { resultType: "error" } : {}
     };
@@ -5422,7 +5717,7 @@ function projectRawMessages(rows, ordinalFor) {
     const message = {
       id: row.id,
       ordinal: ordinalFor(row, index),
-      role: row.type === "assistant" ? "assistant" : "user",
+      role: row.type === "assistant" ? "assistant" : row.type === "system" ? "system" : "user",
       createdAt: row.time_created ?? row.data.time?.created,
       parts: row.type === "assistant" ? (row.data.content ?? []).map((part) => {
         if (part.type !== "tool")

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@retaw106/mmc-pi",
-	"version": "2.4.0",
+	"version": "2.6.0",
 	"type": "module",
 	"description": "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",