@retaw106/mmc-pi 2.3.0 → 2.4.0

package/dist/cli.js

@@ -4981,6 +4981,15 @@ var HistorianModelEntryObjectSchema = object({
   thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for this entry.")
 }).strict();
 var HistorianModelEntrySchema = union([string2(), HistorianModelEntryObjectSchema]);
+var MaintenanceModelEntrySchema = HistorianModelEntrySchema.superRefine((entry, ctx) => {
+  const model = typeof entry === "string" ? entry : entry.model;
+  if (typeof model !== "string" || model.trim().length === 0) {
+    ctx.addIssue({
+      code: "custom",
+      message: "maintenance model entries must be non-empty: a bare provider/model string or { model, variant?, thinking_level? }"
+    });
+  }
+});
 var ProfileHistorianSchema = object({
   model: HistorianModelEntrySchema.optional().describe("Primary historian model entry."),
   fallback_models: array(HistorianModelEntrySchema).optional().describe("Ordered fallback historian model entries."),
@@ -5107,6 +5116,8 @@ var MagicContextConfigSchema = object({
   }).describe("Cross-session memory configuration"),
   maintenance: object({
     enabled: boolean2().default(true).describe("Enable the automatic memory-maintenance task (default: true). USER-LEVEL ONLY — the whole maintenance group is stripped from project-tier config."),
+    model: MaintenanceModelEntrySchema.optional().describe("Primary maintenance model entry: a bare provider/model string or { model, variant? (OpenCode), thinking_level? (Pi) }. USER-LEVEL ONLY. When absent, inherit historian model configuration. If neither has a primary, automatic passes skip and manual runs refuse. The main-session model is never inherited."),
+    fallback_models: array(MaintenanceModelEntrySchema).optional().describe("Ordered fallback maintenance model entries, tried after CALL failures only. When absent and the primary is inherited, inherit historian fallbacks; explicit [] disables fallbacks. Illegal manifests, permission refusals, and exhausted budgets never switch models."),
     budgets: object({
       inputTokens: number2().int().min(1).default(400000).describe("Per-run input-token budget (input + cacheRead + cacheWrite pricing dimensions). Default 400000."),
       outputTokens: number2().int().min(1).default(32000).describe("Per-run output-token budget. Default 32000."),
@@ -5148,7 +5159,7 @@ var MagicContextConfigSchema = object({
       maxRetries: 3
     },
     anomalyThreshold: { absoluteRows: 10, poolFraction: 0.25 }
-  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: the whole group is stripped from project-tier config so a cloned repository cannot raise budgets, relax cooldowns, or loosen the anomaly guard.")
+  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: project-tier config cannot pick maintenance models or change run controls. An absent model inherits historian model configuration, never the session model.")
 });
 var LIVE_RELOAD_CONFIG_PATHS = [
   "cache_ttl",

package/dist/config-init.js

@@ -4998,6 +4998,15 @@ var HistorianModelEntryObjectSchema = object({
   thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for this entry.")
 }).strict();
 var HistorianModelEntrySchema = union([string2(), HistorianModelEntryObjectSchema]);
+var MaintenanceModelEntrySchema = HistorianModelEntrySchema.superRefine((entry, ctx) => {
+  const model = typeof entry === "string" ? entry : entry.model;
+  if (typeof model !== "string" || model.trim().length === 0) {
+    ctx.addIssue({
+      code: "custom",
+      message: "maintenance model entries must be non-empty: a bare provider/model string or { model, variant?, thinking_level? }"
+    });
+  }
+});
 var ProfileHistorianSchema = object({
   model: HistorianModelEntrySchema.optional().describe("Primary historian model entry."),
   fallback_models: array(HistorianModelEntrySchema).optional().describe("Ordered fallback historian model entries."),
@@ -5124,6 +5133,8 @@ var MagicContextConfigSchema = object({
   }).describe("Cross-session memory configuration"),
   maintenance: object({
     enabled: boolean2().default(true).describe("Enable the automatic memory-maintenance task (default: true). USER-LEVEL ONLY — the whole maintenance group is stripped from project-tier config."),
+    model: MaintenanceModelEntrySchema.optional().describe("Primary maintenance model entry: a bare provider/model string or { model, variant? (OpenCode), thinking_level? (Pi) }. USER-LEVEL ONLY. When absent, inherit historian model configuration. If neither has a primary, automatic passes skip and manual runs refuse. The main-session model is never inherited."),
+    fallback_models: array(MaintenanceModelEntrySchema).optional().describe("Ordered fallback maintenance model entries, tried after CALL failures only. When absent and the primary is inherited, inherit historian fallbacks; explicit [] disables fallbacks. Illegal manifests, permission refusals, and exhausted budgets never switch models."),
     budgets: object({
       inputTokens: number2().int().min(1).default(400000).describe("Per-run input-token budget (input + cacheRead + cacheWrite pricing dimensions). Default 400000."),
       outputTokens: number2().int().min(1).default(32000).describe("Per-run output-token budget. Default 32000."),
@@ -5165,7 +5176,7 @@ var MagicContextConfigSchema = object({
       maxRetries: 3
     },
     anomalyThreshold: { absoluteRows: 10, poolFraction: 0.25 }
-  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: the whole group is stripped from project-tier config so a cloned repository cannot raise budgets, relax cooldowns, or loosen the anomaly guard.")
+  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: project-tier config cannot pick maintenance models or change run controls. An absent model inherits historian model configuration, never the session model.")
 });
 var LIVE_RELOAD_CONFIG_PATHS = [
   "cache_ttl",

package/dist/{index-3qawqvws.js → index-cr4hzd76.js}

@@ -1,5 +1,9 @@
 // ../plugin/src/shared/sqlite.ts
-import { AsyncLocalStorage } from "node:async_hooks";
+import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
+var resourceRoot = new AsyncResource("magic-context:root");
+function inRootAsyncContext(operation) {
+  return resourceRoot.runInAsyncScope(operation);
+}
 var reportSlowPrivilegedWrite;
 function registerSlowWriteReporter(reporter) {
   reportSlowPrivilegedWrite = reporter;
@@ -190,7 +194,7 @@ function installTransactionRouting(db, readonly) {
         return endWriterTransaction(db, () => nativeExec(sql), sql);
       if (!/^\s*(?:SELECT|EXPLAIN|PRAGMA|COMMIT|END|ROLLBACK|SAVEPOINT|RELEASE)\b/i.test(sql)) {
         try {
-          return withAutocommitTimeout(db, () => nativeExec(sql));
+          return withAutocommitTimeout(db, () => nativeExec(sql), false);
         } finally {
           if (mayChangeTagIdentity(sql))
             tagIdentityWriteGeneration += 1;
@@ -332,7 +336,7 @@ function trackSqliteConnection(db, filename, options) {
 }
 var TrackedDatabase = new Proxy(DatabaseImpl, {
   construct(target, args) {
-    const db = Reflect.construct(target, args, target);
+    const db = inRootAsyncContext(() => Reflect.construct(target, args, target));
     return trackSqliteConnection(db, args[0], args[1]);
   }
 });
@@ -516,29 +520,48 @@ function foregroundWaitLease() {
   const lease = transformPassScope.getStore();
   return lease?.active && !admissionScope.getStore() && !backgroundWriterScope.getStore() ? lease : undefined;
 }
-function withAutocommitTimeout(db, operation) {
+function withAutocommitTimeout(db, operation, singleStatement = true) {
   assertTransformWrite();
   const lease = foregroundWaitLease();
   if (isInTransaction(db))
     return operation();
   const scoped = lease || backgroundWriterScope.getStore();
   const previous = scoped ? pragmaNumber(db, "busy_timeout") : null;
-  if (scoped)
-    db.exec(`PRAGMA busy_timeout=${lease ? Math.floor(Math.min(lease.remainingWaitMs, lease.guard?.remainingMs() ?? Infinity)) : SHORT_BUSY_TIMEOUT_MS}`);
   const started = performance.now();
   let completed = false;
-  try {
+  const execute = () => {
     const result = operation();
     completed = true;
     return result;
+  };
+  try {
+    if (!scoped)
+      return execute();
+    if (singleStatement) {
+      db.exec("PRAGMA busy_timeout=0");
+      try {
+        return execute();
+      } catch (error) {
+        if (!isTransientSqliteError(error) || isInTransaction(db))
+          throw error;
+      }
+      assertTransformWrite();
+    }
+    const timeout = Math.floor(Math.min(lease?.remainingWaitMs ?? SHORT_BUSY_TIMEOUT_MS, lease?.guard?.remainingMs() ?? Infinity));
+    db.exec(`PRAGMA busy_timeout=${timeout}`);
+    const waitStarted = performance.now();
+    try {
+      return execute();
+    } finally {
+      if (lease)
+        lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - (performance.now() - waitStarted));
+    }
   } catch (error) {
     if (lease && isTransientSqliteError(error))
       throw new SqliteAcquisitionBusyError(error, "autocommit");
     throw error;
   } finally {
     const elapsed = performance.now() - started;
-    if (lease)
-      lease.remainingWaitMs = Math.max(0, lease.remainingWaitMs - elapsed);
     if (previous !== null)
       db.exec(`PRAGMA busy_timeout=${previous}`);
     if (elapsed >= SLOW_WRITER_LOG_MS)
@@ -768,4 +791,4 @@ async function withIndexChunk(input, operation) {
   }
 }
 
-export { registerSlowWriteReporter, registerSqliteDiagnosticSink, detectSqliteRuntime, getTagIdentityWriteGeneration, Database, getSqliteDatabasePath, prepareCachedStatement, withSqliteBackgroundWriter, withSqliteTransformPass, withoutSqliteTransformPass, guardSqliteTransformPass, isTransientSqliteError, withAsyncPrivilegedWriter, withPrivilegedWriter, indexCoordinationInput, withIndexChunk };
+export { inRootAsyncContext, registerSlowWriteReporter, registerSqliteDiagnosticSink, detectSqliteRuntime, getTagIdentityWriteGeneration, Database, getSqliteDatabasePath, prepareCachedStatement, withSqliteBackgroundWriter, withSqliteTransformPass, withoutSqliteTransformPass, guardSqliteTransformPass, isTransientSqliteError, withAsyncPrivilegedWriter, withPrivilegedWriter, indexCoordinationInput, withIndexChunk };