@cortexkit/pi-magic-context 0.49.34 → 0.49.35

package/dist/index.js

@@ -9,15 +9,17 @@ import {
   getMagicContextStorageDir,
   isMagicContextStorageOutsideEngram,
   claimStorageBackupWarningCheck,
-  sanitizeDiagnosticText,
-  hasShareabilitySensitiveText,
   registerStalePluginBuildHost,
   classifyStalePluginBuild,
   importPluginModule,
   log2,
   sessionLog2,
   flushLogger2
-} from "./index-fgs78jyd.js";
+} from "./index-gymgz20n.js";
+import {
+  sanitizeDiagnosticText,
+  hasShareabilitySensitiveText
+} from "./index-dnp1jjar.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
@@ -47,121 +49,6 @@ import {
   cortexKitProjectConfigBasePath,
   migrateMagicContextConfigLocations,
   getProtectedTokensTierOverrides,
-  LkgRecoveryFenceError,
-  clearLkgFenceProcessState,
-  lkgFenceRequiresRebuild,
-  lkgRecoveryFenceUnclean,
-  ownsLkgDirtyFence,
-  invalidateCleanLkgRecoveryFence,
-  markLkgRecoveryDirty,
-  rememberUnpublishedAutoSearchNoHint,
-  getUnpublishedAutoSearchNoHint,
-  forgetUnpublishedAutoSearchNoHint,
-  registerAutoSearchWork,
-  cancelAutoSearchWork,
-  readSessionActivity,
-  observeSessionActivity,
-  backfillSessionActivity,
-  readSessionMeta,
-  getOrCreateSessionMeta,
-  updateSessionMeta,
-  advanceToolReclaimWatermark,
-  retryPendingSessionCleanups,
-  retryPendingRustSessionCleanupsForProject,
-  COMPARTMENT_LEASE_RENEWAL_MS,
-  acquireCompartmentLease,
-  renewCompartmentLease,
-  releaseCompartmentLease,
-  releaseCompartmentLeaseBestEffort,
-  isCompartmentLeaseHeld,
-  isNoContentCompartment,
-  HAS_COMPARTMENT_CONTENT_SQL,
-  queueM0Mutation,
-  getMaxM0MutationId,
-  getCompartments,
-  getLastCompartmentEndMessage,
-  getLastCompartmentEndMessageId,
-  getCompartmentsByEndMessageId,
-  appendCompartments,
-  saveRecompStagingPass,
-  getRecompStaging,
-  clearRecompStaging,
-  getRecompPartialRange,
-  setRecompPartialRange,
-  escapeXmlAttr,
-  escapeXmlContent,
-  getUncoveredCompartmentEndThrough,
-  isPartialCompartmentEnd,
-  readProjectDocsCanonical,
-  providerResponseFailed,
-  isSuccessfulProviderCompletion,
-  requestPendingMaterialization,
-  pendingMaterializationOrigin,
-  hasPendingMaterializationOrigin,
-  clearPendingMaterialization,
-  recordSystemRefreshOwnership,
-  recordSystemPromptForRequest,
-  recordHeldHeadForRequest,
-  bindSystemPromptResponse,
-  acknowledgeSystemPromptDelivery,
-  deferDeliveredSystemRefresh,
-  clearSystemPromptDelivery,
-  saveLkgSlotToDb,
-  loadPersistedLkgSlot,
-  drainStaleLkgSlots,
-  createDbLkgPersistence,
-  replayLkg,
-  registerLkgPersistence,
-  LKG_SNAPSHOT_ARRAY,
-  LKG_SNAPSHOT_OBJECT,
-  LKG_SNAPSHOT_KEY,
-  LKG_SNAPSHOT_STRING,
-  LKG_SNAPSHOT_NUMBER,
-  LKG_SNAPSHOT_BOOLEAN,
-  LKG_SNAPSHOT_NULL,
-  LKG_SNAPSHOT_UNDEFINED,
-  contentSnapshotValue,
-  signatureForFields,
-  lkgContentFields,
-  lkgContentDigestFromFields,
-  isLegacyLkgDigest,
-  legacyLkgDigestFromFields,
-  lkgFieldsMatchDigest,
-  exactReusablePrefix,
-  incrementalLkgContentDigests,
-  lkgSlotRejection,
-  captureSlot,
-  getInMemorySlot,
-  getSlot,
-  dropSlot,
-  TOOL_SWEEP_SCOPED_MARKER,
-  encodePiContentDecision,
-  decodePiContentDecision,
-  getPiContentDecisions,
-  freezePiContentDecision,
-  withNativeReplayWriteBarrier,
-  getNativeReplayState,
-  saveNativeToolInputs,
-  addNativeReasoningIds,
-  copySessionStateForClone,
-  externalHistorianFailureReason,
-  subprocessExitHistorianFailureReason,
-  countHistorianRuns,
-  recordHistorianRun,
-  summarizeImportance,
-  tallyFactsByCategory,
-  queueMemoryMutation,
-  getMemoryMutationsForRender,
-  getMemoryMutationsForRenderByProjects,
-  getMaxMemoryMutationId,
-  getMaxMemoryMutationIdForProjects,
-  GLOBAL_USER_PROFILE_PROJECT_PATH,
-  getProjectState,
-  bumpProjectUserProfileVersion,
-  saveSourceContent,
-  getSourceContents,
-  recordSubagentInvocation,
-  getLatestHistorianInvocationId,
   noteTouchedAt,
   noteNudgePickIndex,
   formatNoteNudge,
@@ -263,7 +150,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-f4fz95fy.js";
+} from "./index-fzm8fm4z.js";
 import"./index-4knyh1kt.js";
 import {
   canonicalModelIdentity,
@@ -288,26 +175,9 @@ import {
   createFailClosedBlockingError,
   isFailClosedBlockingError,
   shouldBypassFailClosedBlock,
-  createFailClosedController,
-  piHarnessKindFromExecutable,
-  getErrorMessage,
-  describeError,
-  startBootDeadline,
-  getSchemaFenceRejection,
-  getMigrationOnOpenRefusal,
-  LATEST_SUPPORTED_VERSION,
-  getDatabasePath,
-  getPersistedSchemaVersion,
-  setSqlitePragmaConfig,
-  applySqliteTuningPragmas,
-  runSqliteOptimize,
-  openDatabase,
-  openCurrentDatabase,
-  openDatabaseAsync,
-  closeDatabase
-} from "./index-np9ryr8y.js";
+  createFailClosedController
+} from "./index-3bb24eb6.js";
 import {
-  sameProjectDirectory,
   pruneMissingProjectIdentities,
   setHomeProjectPermission,
   ProjectIdentityError,
@@ -318,7 +188,7 @@ import {
   resolveProjectIdentityForSession,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-48twbev2.js";
+} from "./index-6pk49fc3.js";
 import {
   detectThinkingBindingMismatch,
   detectLatestTurnThinkingMismatch,
@@ -424,7 +294,7 @@ import {
   getSessionWorkMetrics,
   resolveEpochFloorForPass,
   askAnswerLines,
-  retreatPastHostUnservedRows,
+  removeUnsupportedCommitHashes,
   completedToolArcCrossesBoundary,
   estimateTrueRawMessageTokens,
   buildToolArcs,
@@ -483,7 +353,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-eenxm3t3.js";
+} from "./index-svqk0701.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -570,7 +440,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-eqw9t2ty.js";
+} from "./index-yhsmjvqa.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -582,7 +452,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./index-my0dn413.js";
+} from "./index-wt7vmyj4.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -602,27 +472,162 @@ import {
   observeTemporalDecisions,
   freezeTemporalDecisions,
   tagIdentityRevisionKey
-} from "./index-c474g0gj.js";
+} from "./index-yacs388s.js";
+import {
+  piHarnessKindFromExecutable,
+  getErrorMessage,
+  describeError,
+  startBootDeadline,
+  getSchemaFenceRejection,
+  getMigrationOnOpenRefusal,
+  LATEST_SUPPORTED_VERSION,
+  getDatabasePath,
+  getPersistedSchemaVersion,
+  setSqlitePragmaConfig,
+  applySqliteTuningPragmas,
+  runSqliteOptimize,
+  openDatabase,
+  openCurrentDatabase,
+  openDatabaseAsync,
+  closeDatabase
+} from "./index-11knwv2h.js";
+import {
+  LkgRecoveryFenceError,
+  clearLkgFenceProcessState,
+  lkgFenceRequiresRebuild,
+  lkgRecoveryFenceUnclean,
+  ownsLkgDirtyFence,
+  invalidateCleanLkgRecoveryFence,
+  markLkgRecoveryDirty,
+  rememberUnpublishedAutoSearchNoHint,
+  getUnpublishedAutoSearchNoHint,
+  forgetUnpublishedAutoSearchNoHint,
+  registerAutoSearchWork,
+  cancelAutoSearchWork,
+  readSessionActivity,
+  observeSessionActivity,
+  backfillSessionActivity,
+  readSessionMeta,
+  getOrCreateSessionMeta,
+  updateSessionMeta,
+  advanceToolReclaimWatermark,
+  retryPendingSessionCleanups,
+  retryPendingRustSessionCleanupsForProject,
+  COMPARTMENT_LEASE_RENEWAL_MS,
+  acquireCompartmentLease,
+  renewCompartmentLease,
+  releaseCompartmentLease,
+  releaseCompartmentLeaseBestEffort,
+  isCompartmentLeaseHeld,
+  isNoContentCompartment,
+  HAS_COMPARTMENT_CONTENT_SQL,
+  queueM0Mutation,
+  getMaxM0MutationId,
+  getCompartments,
+  getLastCompartmentEndMessage,
+  getLastCompartmentEndMessageId,
+  getCompartmentsByEndMessageId,
+  appendCompartments,
+  saveRecompStagingPass,
+  getRecompStaging,
+  clearRecompStaging,
+  getRecompPartialRange,
+  setRecompPartialRange,
+  escapeXmlAttr,
+  escapeXmlContent,
+  getUncoveredCompartmentEndThrough,
+  isPartialCompartmentEnd,
+  readProjectDocsCanonical,
+  providerResponseFailed,
+  isSuccessfulProviderCompletion,
+  requestPendingMaterialization,
+  pendingMaterializationOrigin,
+  hasPendingMaterializationOrigin,
+  clearPendingMaterialization,
+  recordSystemRefreshOwnership,
+  recordSystemPromptForRequest,
+  recordHeldHeadForRequest,
+  bindSystemPromptResponse,
+  acknowledgeSystemPromptDelivery,
+  deferDeliveredSystemRefresh,
+  clearSystemPromptDelivery,
+  saveLkgSlotToDb,
+  loadPersistedLkgSlot,
+  drainStaleLkgSlots,
+  createDbLkgPersistence,
+  replayLkg,
+  registerLkgPersistence,
+  LKG_SNAPSHOT_ARRAY,
+  LKG_SNAPSHOT_OBJECT,
+  LKG_SNAPSHOT_KEY,
+  LKG_SNAPSHOT_STRING,
+  LKG_SNAPSHOT_NUMBER,
+  LKG_SNAPSHOT_BOOLEAN,
+  LKG_SNAPSHOT_NULL,
+  LKG_SNAPSHOT_UNDEFINED,
+  contentSnapshotValue,
+  signatureForFields,
+  lkgContentFields,
+  lkgContentDigestFromFields,
+  isLegacyLkgDigest,
+  legacyLkgDigestFromFields,
+  lkgFieldsMatchDigest,
+  exactReusablePrefix,
+  incrementalLkgContentDigests,
+  lkgSlotRejection,
+  captureSlot,
+  getInMemorySlot,
+  getSlot,
+  dropSlot,
+  TOOL_SWEEP_SCOPED_MARKER,
+  encodePiContentDecision,
+  decodePiContentDecision,
+  getPiContentDecisions,
+  freezePiContentDecision,
+  withNativeReplayWriteBarrier,
+  getNativeReplayState,
+  saveNativeToolInputs,
+  addNativeReasoningIds,
+  copySessionStateForClone,
+  externalHistorianFailureReason,
+  subprocessExitHistorianFailureReason,
+  countHistorianRuns,
+  recordHistorianRun,
+  summarizeImportance,
+  tallyFactsByCategory,
+  queueMemoryMutation,
+  getMemoryMutationsForRender,
+  getMemoryMutationsForRenderByProjects,
+  getMaxMemoryMutationId,
+  getMaxMemoryMutationIdForProjects,
+  GLOBAL_USER_PROFILE_PROJECT_PATH,
+  getProjectState,
+  bumpProjectUserProfileVersion,
+  saveSourceContent,
+  getSourceContents,
+  recordSubagentInvocation,
+  getLatestHistorianInvocationId
+} from "./index-d21rhpbd.js";
 import {
-  BoundedSessionMap,
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
   openCodeDbPathExists,
   recordOpenCodeDbReadFailure,
   clearOpenCodeDbReadFailure,
   claimOpenCodeDbDiagnosticOnce
-} from "./index-23t8ryqw.js";
+} from "./index-n0zjvs3h.js";
 import"./index-399p688g.js";
 import {
   createWorkerShutdown
 } from "./index-54wmg4rj.js";
 import {
   RAW_SUMMARY_TEXT_MAX_CHARS2
-} from "./index-6981g1xv.js";
+} from "./index-mkh1cm5k.js";
+import"./index-ea37qn4x.js";
 import {
   formatSynapseLaneDescriptor
-} from "./index-gwxaz0z5.js";
-import"./index-bvpar0bg.js";
+} from "./index-rzfr7wdv.js";
+import"./index-rgvqh5x7.js";
 import {
   buildCanonicalChunkTextFromFts2,
   buildCompartmentSummaryFallbackText2,
@@ -632,7 +637,7 @@ import {
   replaceCompartmentChunkEmbeddings2,
   deleteChunkEmbedBackoffForSession2,
   chunkWindowSourceKey2
-} from "./index-0gymvr5j.js";
+} from "./index-2p691ayw.js";
 import {
   recordSessionProjectIdentity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
@@ -641,7 +646,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-4zemngt7.js";
+} from "./index-mp0gh04g.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -650,33 +655,20 @@ import {
   autoEmbedIdentityBySession,
   autoEmbedRetryAfterBySession,
   invalidateAutoEmbedSession,
-  getEmbedDrainUiStatus,
-  describeShadowBackfillWriteRefusal2,
-  contentSha2562,
-  drainProjectEmbeddingIdentityMaintenance2,
-  drainStaleEmbeddingIdentitiesForProject2,
-  enqueueShadowEmbeddingItems2,
-  getProjectEmbeddingSnapshot2,
-  getProjectChunkEmbeddingModelId2,
-  getProjectEmbeddingMaxInputTokens2,
-  embedTextForProject2,
-  embedBatchForProject2,
-  embedItemsForProject2,
-  embedUnembeddedMemoriesForProject2,
-  drainCommitBacklogForProject2,
-  embedSessionCompartmentChunks2,
-  getEmbeddingCoverageStatus2,
-  getAutoEmbeddingSessionCoverage2
-} from "./index-xn5yh0pn.js";
+  getEmbedDrainUiStatus
+} from "./index-hgd00nas.js";
 import {
   clearCompressionDepth,
   clearCompressionDepthRange,
   cleanSearchText,
   matchedSearchSnippet
-} from "./index-e61zxfts.js";
+} from "./index-8m82cez2.js";
 import {
   rememberV1HiddenRun
 } from "./index-6x556c2q.js";
+import {
+  BoundedSessionMap
+} from "./index-c6wbq66z.js";
 import {
   V2_MEMORY_CATEGORIES
 } from "./index-135e8hvg.js";
@@ -688,7 +680,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-pb3ea2tq.js";
+} from "./index-d107f484.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -712,39 +704,8 @@ import {
   getActivePrimers,
   createPrimer,
   updatePrimerSupport,
-  updatePrimerAnswer,
-  USER_FACING_FAILURES,
-  renderUserFacingFailure,
-  userFacingFailureCode,
-  renderCapabilityRefusal,
-  renderDreamFailure,
-  dreamFailureCode,
-  renderEmbeddingFailure,
-  renderSingleStoreMigrationRequiredRefusal,
-  SingleStoreMigrationRequiredError,
-  projectNeedsSingleStoreMigration,
-  promoteSessionFactsDurable,
-  embedPromotedFacts,
-  recordMemoryMapping,
-  recordMemoryVerifications,
-  getUnmappedMemoryIds,
-  clearMemoryVerifications,
-  getMemoryVerifications,
-  resolveGitTopLevel,
-  readGitHead,
-  readGitChangedFilesSince,
-  readGitFileChangeTimesSince,
-  verificationFileExists,
-  normalizeVerificationFiles,
-  indexCommitsForProject,
-  embedUnembeddedCommits,
-  getMessageIndexEpoch,
-  isMessageIndexSearchable,
-  scheduleReconciliation,
-  scheduleIncrementalIndex,
-  scheduleClearAndReindex,
-  clearSessionTracking
-} from "./index-g2tfayfc.js";
+  updatePrimerAnswer
+} from "./index-w26zvs1q.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -777,11 +738,63 @@ import {
 } from "./index-q1yc6bs0.js";
 import {
   getCachedLocalEmbeddingPooling
-} from "./index-wqpjhx1p.js";
+} from "./index-2qqsnh1b.js";
+import {
+  describeShadowBackfillWriteRefusal2,
+  contentSha2562,
+  drainProjectEmbeddingIdentityMaintenance2,
+  drainStaleEmbeddingIdentitiesForProject2,
+  enqueueShadowEmbeddingItems2,
+  getProjectEmbeddingSnapshot2,
+  getProjectChunkEmbeddingModelId2,
+  getProjectEmbeddingMaxInputTokens2,
+  embedTextForProject2,
+  embedBatchForProject2,
+  embedItemsForProject2,
+  embedUnembeddedMemoriesForProject2,
+  drainCommitBacklogForProject2,
+  embedSessionCompartmentChunks2,
+  getEmbeddingCoverageStatus2,
+  getAutoEmbeddingSessionCoverage2
+} from "./index-a11nmw5t.js";
 import {
   cosineSimilarity
-} from "./index-9xd7qveg.js";
-import"./index-6wdwv3a6.js";
+} from "./index-vgfk2xa5.js";
+import {
+  USER_FACING_FAILURES,
+  renderUserFacingFailure,
+  userFacingFailureCode,
+  renderCapabilityRefusal,
+  renderDreamFailure,
+  dreamFailureCode,
+  renderEmbeddingFailure,
+  renderSingleStoreMigrationRequiredRefusal,
+  SingleStoreMigrationRequiredError,
+  projectNeedsSingleStoreMigration,
+  promoteSessionFactsDurable,
+  embedPromotedFacts,
+  recordMemoryMapping,
+  recordMemoryVerifications,
+  getUnmappedMemoryIds,
+  clearMemoryVerifications,
+  getMemoryVerifications,
+  resolveGitTopLevel,
+  readGitHead,
+  readGitChangedFilesSince,
+  readGitFileChangeTimesSince,
+  verificationFileExists,
+  normalizeVerificationFiles,
+  indexCommitsForProject,
+  embedUnembeddedCommits,
+  getMessageIndexEpoch,
+  isMessageIndexSearchable,
+  scheduleReconciliation,
+  scheduleIncrementalIndex,
+  scheduleClearAndReindex,
+  clearSessionTracking,
+  createAutoSearchDiagnostics
+} from "./index-yg42q9bc.js";
+import"./index-d0w84hy5.js";
 import {
   DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS,
   buildHiddenAgentRegistrations,
@@ -808,19 +821,26 @@ import {
   drainPiTagSnapshotSession,
   assertPiTagSnapshotReady,
   ensurePiTagSnapshotReady
-} from "./index-0mc0vv97.js";
-import"./index-jn44h81p.js";
+} from "./index-0rvn6vhq.js";
+import"./index-cq71g4dk.js";
 import"./index-1cvyaw9a.js";
-import"./index-cj3bkd16.js";
+import"./index-6y6v2wvn.js";
+import"./index-m68qfjte.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
+import {
+  retreatPastHostUnservedRows
+} from "./index-by1bzjcd.js";
 import {
   computeNormalizedHash
 } from "./index-9x1f96r8.js";
 import {
   normalizeProtectedToolName
 } from "./index-674f6qs2.js";
+import {
+  sameProjectDirectory
+} from "./index-wrr9rp9a.js";
 import {
   closeQuietly,
   isKnownAutocommit
@@ -828,7 +848,7 @@ import {
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
-} from "./index-hqw0rt9k.js";
+} from "./index-0wtm7g7f.js";
 import {
   setStoragePrivatePermissionEnforcement,
   ensureStorageDirectorySync,
@@ -3560,7 +3580,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.34",
+  version: "0.49.35",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -7235,6 +7255,15 @@ function validateHistorianOutput(text, sessionId, chunk, _priorCompartments, seq
       error: "Historian terminal boundary splits a completed tool invocation/result arc"
     });
   }
+  for (const compartment of mapped.compartments) {
+    const supported = new Set(chunk.lines.filter((line) => line.ordinal >= compartment.startMessage && line.ordinal <= compartment.endMessage).flatMap((line) => line.commitHashes ?? []));
+    for (const field of ["title", "content", "p1", "p2", "p3", "p4"]) {
+      const value = compartment[field];
+      if (typeof value === "string") {
+        compartment[field] = removeUnsupportedCommitHashes(value, supported);
+      }
+    }
+  }
   return finish({
     ok: true,
     compartments: mapped.compartments,
@@ -24734,6 +24763,50 @@ function prepareLegacyToolSkeletonConversions(db, sessionId, targets, options =
     }
   };
 }
+function prepareAgedToolSkeletonConversions(db, sessionId, targets, options = {}) {
+  const candidates = [...targets.keys()].sort((a, b) => a - b);
+  const readRows = (connection) => {
+    const window = getNewestToolTagNumbers2(connection, sessionId, RECENT_TOOL_SKELETON_WINDOW);
+    const recent = new Set(window);
+    const statement = connection.prepare(`SELECT tag_number AS tagNumber, drop_mode AS dropMode, message_id AS callId
+             FROM tags WHERE session_id = ? AND tag_number = ?
+               AND type = 'tool' AND status = 'dropped'
+               AND drop_mode IN ('truncated', 'skeleton_real', 'skeleton_stripped')`);
+    const rows = candidates.filter((id) => !recent.has(id)).flatMap((id) => {
+      const row = statement.get(sessionId, id);
+      return row ? [row] : [];
+    });
+    return { window, rows };
+  };
+  const snapshot = readRows(db);
+  options.prepareRemovals?.(snapshot.rows);
+  const converted = new Map;
+  const plannedRemovals = new Set;
+  for (const row of snapshot.rows) {
+    const target = targets.get(row.tagNumber);
+    if (target?.thinkingDropProtected || target?.thinkingRewriteProtected || target?.identityRepairProtected)
+      continue;
+    if (target?.canDrop?.() !== true || target.prepareDrop?.() === false)
+      continue;
+    if (target.requiresToolArcSkeleton) {
+      const owners = target.mutationParts ? target.mutationParts.map(({ message }) => message).filter((message) => message.info.role === "assistant") : target.message ? [target.message] : [];
+      if (owners.length === 0 || owners.some((message) => !options.thinkingStrippedIds?.has(message.info.id ?? "")))
+        continue;
+    }
+    if (target.cannotRemove?.() === true || target.wouldStrandConversationEnd?.(plannedRemovals) === true)
+      continue;
+    converted.set(row.tagNumber, "full");
+    target.notePlannedRemoval?.(plannedRemovals);
+  }
+  return {
+    converted,
+    isCurrent: (connection) => JSON.stringify(readRows(connection)) === JSON.stringify(snapshot),
+    persist: (connection) => {
+      for (const tagNumber of converted.keys())
+        updateTagDropMode2(connection, sessionId, tagNumber, "full");
+    }
+  };
+}
 var PENDING_OPERATION_CHUNK_SIZE = 64;
 function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set, onTagReduced, onBatchComplete, onEligibilitySnapshot) {
   let didMutateMessage = false;
@@ -28536,6 +28609,32 @@ function selectAutoSearchResults(results, threshold) {
   return results.filter((result) => relevance(result) >= threshold).sort((left, right) => relevance(right) - relevance(left));
 }
 
+// ../plugin/src/hooks/magic-context/auto-search-observation.ts
+var disabledTurns = new WeakMap;
+function logDisabledAutoSearch(db, sessionId, messageId, threshold, startedAt) {
+  const sessions = disabledTurns.get(db) ?? new Map;
+  disabledTurns.set(db, sessions);
+  if (sessions.get(sessionId) === messageId)
+    return;
+  sessions.set(sessionId, messageId);
+  observeAutoSearch(sessionId, threshold, startedAt).finish("disabled");
+}
+function observeAutoSearch(sessionId, threshold, startedAt) {
+  const diagnostics = createAutoSearchDiagnostics(threshold);
+  let logged = false;
+  return {
+    diagnostics,
+    finish(outcome, reason) {
+      if (logged)
+        return;
+      logged = true;
+      const lanes = Object.entries(diagnostics.lanes).map(([lane, value]) => `${lane}:${value.top?.toFixed(3) ?? "none"}`).join(",");
+      const nearMisses = Object.values(diagnostics.lanes).reduce((sum, lane) => sum + lane.nearMisses, 0);
+      sessionLog2(sessionId, `auto-search: decision outcome=${outcome}${reason ? ` reason=${reason}` : ""} lanes=${lanes || "none"} nearMisses=${nearMisses} threshold=${threshold} pool=${diagnostics.pool} rows=${diagnostics.poolRows ?? "unknown"} workerStarted=${diagnostics.workerStarted ?? "unknown"} peek=${diagnostics.peek} elapsedMs=${Math.round(performance.now() - startedAt)}`);
+    }
+  };
+}
+
 // ../plugin/src/hooks/magic-context/auto-search-worker-client.ts
 import { Worker } from "node:worker_threads";
 var pendingRegistrations = new WeakMap;
@@ -28773,6 +28872,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     readMessages: _readMessages,
     searchMessageHistory: _searchMessageHistory,
     stepTimings: _stepTimings,
+    onAutoSearchDiagnostics: _onAutoSearchDiagnostics,
     ...serializable
   } = options;
   const lifecycle = registerAutoSearchWork(sessionId);
@@ -28814,6 +28914,11 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     throw new AutoSearchBusyError;
   }
   const { slot, fresh } = lease;
+  if (options.autoSearchDiagnostics) {
+    options.autoSearchDiagnostics.workerStarted = fresh;
+    if (fresh)
+      options.autoSearchDiagnostics.pool = "cold";
+  }
   const worker = slot.worker;
   const detachable = job === "search" && entry.href === defaultAutoSearchWorkerEntry().href;
   const startedAt = performance.now();
@@ -28893,6 +28998,15 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     const onMessage = async (reply) => {
       if (released)
         return;
+      if (reply.kind === "diagnostics") {
+        if (!settled && options.autoSearchDiagnostics) {
+          const workerStarted = options.autoSearchDiagnostics.workerStarted;
+          Object.assign(options.autoSearchDiagnostics, reply.diagnostics, {
+            workerStarted
+          });
+        }
+        return;
+      }
       if (reply.kind === "result" || reply.kind === "error") {
         if (detachedAt !== undefined) {
           logLateSearch(sessionId, performance.now() - detachedAt, detachedAt - startedAt, ownerVectorMs, reply.kind === "result" ? reply.timings : undefined, reply.kind === "error");
@@ -29096,8 +29210,6 @@ async function runAutoSearchHintForPi(args) {
     const timestamp = message.timestamp;
     return `test-entry-${index}:${typeof timestamp === "number" ? timestamp : "no-ts"}`;
   }) : args.entryIds;
-  if (!options.enabled)
-    return messages;
   const strictResolutionFailed = entryIds === null;
   const effectiveEntryIds = strictResolutionFailed ? messages.map((message) => {
     const id = message.id;
@@ -29107,6 +29219,11 @@ async function runAutoSearchHintForPi(args) {
   if (found === null)
     return messages;
   const { message: userMsg, messageId: userMsgId } = found;
+  if (!options.enabled) {
+    if (found.index === messages.length - 1)
+      logDisabledAutoSearch(db, sessionId, userMsgId, options.scoreThreshold ?? DEFAULT_SCORE_THRESHOLD, startedAt);
+    return messages;
+  }
   await wait(coalesceAutoSearchTurn(db, sessionId, userMsgId, async (lifecycleSignal) => {
     args.passGuard?.assert();
     if (lifecycleSignal.aborted)
@@ -29133,10 +29250,12 @@ async function runAutoSearchHintForPi(args) {
       return messages;
     if (!isUsableProjectIdentity(options.projectPath))
       return messages;
+    const observation = observeAutoSearch(sessionId, options.scoreThreshold ?? DEFAULT_SCORE_THRESHOLD, startedAt);
     const snapshot = getProjectEmbeddingSnapshot2(options.projectPath);
     if (!snapshot) {
       queueAutoSearchRegistration(db, options.projectPath, args.ensureProjectRegistered);
       persistAutoSearchSkip(db, sessionId, userMsgId, "empty");
+      observation.finish("no-candidates", "unregistered");
       return messages;
     }
     const writeNoHintAndReconcile = async (reason) => {
@@ -29149,17 +29268,20 @@ async function runAutoSearchHintForPi(args) {
       args.passGuard?.assert();
       if (outcome === null) {
         persistAutoSearchSkip(db, sessionId, userMsgId);
+        observation.finish("timeout");
         return;
       }
-      if (!outcome.ok)
+      if (!outcome.ok) {
+        observation.finish("error", outcome.kind);
         return;
+      }
       if (outcome.kind === "already-present" && outcome.decision.decision === "hint") {
         appendHintToUserMessage(userMsg, outcome.decision.text);
       }
+      observation.finish(outcome.decision.decision === "hint" ? "attached" : reason === "below-threshold" ? "below-threshold" : reason === "error" ? "error" : "no-candidates", reason);
     };
     const rawPartsText = collectUserPromptParts(userMsg);
     if (hasStackedAugmentation(rawPartsText)) {
-      sessionLog2(sessionId, "auto-search: skipping — user message already carries augmentation/hint");
       await writeNoHintAndReconcile("stacked");
       return messages;
     }
@@ -29179,6 +29301,7 @@ async function runAutoSearchHintForPi(args) {
         const embeddingEnabled = snapshot ? snapshot.historyEnabled : true;
         const gitCommitsEnabled = snapshot?.gitCommitEnabled ?? false;
         const searchOptions = {
+          autoSearchDiagnostics: observation.diagnostics,
           limit: 10,
           maxMessageOrdinal: Math.max(0, getLastCompartmentEndMessage(db, sessionId)),
           excludeMessageId: userMsgId,
@@ -29207,11 +29330,10 @@ async function runAutoSearchHintForPi(args) {
       if (lifecycleSignal.aborted)
         return messages;
       if (error instanceof AutoSearchBusyError) {
-        sessionLog2(sessionId, "auto-search: an earlier search of this session is still running, skipping hint for this turn");
+        observation.finish("timeout", "worker-busy");
         persistAutoSearchSkip(db, sessionId, userMsgId);
         return messages;
       }
-      log2(`[auto-search] unified search failed for session ${sessionId} (no-hint frozen for this turn): ${error instanceof Error ? error.message : String(error)}`);
       await writeNoHintAndReconcile("error");
       return messages;
     }
@@ -29220,7 +29342,7 @@ async function runAutoSearchHintForPi(args) {
       return messages;
     try {
       if (results === null) {
-        sessionLog2(sessionId, `auto-search: timed out after ${AUTO_SEARCH_TIMEOUT_MS}ms, skipping hint for this turn`);
+        observation.finish("timeout");
         persistAutoSearchSkip(db, sessionId, userMsgId);
         return messages;
       }
@@ -29231,7 +29353,6 @@ async function runAutoSearchHintForPi(args) {
       const scoreThreshold = options.scoreThreshold ?? DEFAULT_SCORE_THRESHOLD;
       results = selectAutoSearchResults(results, scoreThreshold);
       if (results.length === 0) {
-        sessionLog2(sessionId, `auto-search: no fragment meets relevance threshold ${scoreThreshold}`);
         await writeNoHintAndReconcile("below-threshold");
         return messages;
       }
@@ -29255,14 +29376,17 @@ ${hintText}`;
       args.passGuard?.assert();
       if (outcome === null) {
         persistAutoSearchSkip(db, sessionId, userMsgId);
+        observation.finish("timeout");
         return messages;
       }
-      if (!outcome.ok)
+      if (!outcome.ok) {
+        observation.finish("error", outcome.kind);
         return messages;
+      }
       if (outcome.decision.decision === "hint") {
         appendHintToUserMessage(userMsg, outcome.decision.text);
       }
-      sessionLog2(sessionId, `auto-search: attached hint to ${userMsgId} (${results.length} fragments, top relevance ${(results[0].relevanceScore ?? results[0].score).toFixed(3)})`);
+      observation.finish(outcome.decision.decision === "hint" ? "attached" : "no-candidates");
       return messages;
     } finally {
       if (!lifecycleSignal.aborted && results !== null) {
@@ -35316,6 +35440,118 @@ function authorizePiToolRemoval(args) {
   }
 }
 
+// src/native-replay-tag-provenance-pi.ts
+import { createHash as createHash12 } from "node:crypto";
+var PI_NATIVE_TAG_STRIP_PROVENANCE = "magicContextNativeTagStrips";
+function nativeResponseTagStripKey(id, phase, text) {
+  return createHash12("sha256").update(JSON.stringify([id, phase, text])).digest("hex");
+}
+function ownsNativeResponseTagStrip(decisions, id, phase, text) {
+  if (!isRecord(decisions) || phase !== undefined && phase !== "commentary" && phase !== "final_answer")
+    return false;
+  return Object.entries(decisions).some(([key, original]) => typeof original === "string" && /^§\d+§ /u.test(original) && original.replace(/^§\d+§ /u, "") === text && nativeResponseTagStripKey(id, phase, original) === key);
+}
+
+// src/native-replay-tags-pi.ts
+var FIELD = "piResponsesTagStrips";
+var TAG = /^§\d+§ /u;
+function readDecisions(value) {
+  if (value === undefined)
+    return new Set;
+  if (!Array.isArray(value) || !value.every((key) => typeof key === "string" && /^[a-f0-9]{64}$/u.test(key)))
+    throw new Error("Invalid persisted Responses tag strips");
+  return new Set(value);
+}
+function signature(part) {
+  if (!isRecord(part) || typeof part.textSignature !== "string")
+    return;
+  try {
+    const value = JSON.parse(part.textSignature);
+    if (isRecord(value) && value.v === 1 && typeof value.id === "string" && value.id.length > 0 && (value.phase === undefined || value.phase === "commentary" || value.phase === "final_answer"))
+      return { id: value.id, phase: value.phase };
+  } catch {}
+}
+function applyNativeResponseTagReplayPi(args) {
+  let saved;
+  const added = new Set;
+  const pending = new Map;
+  for (const [index, message] of args.messages.entries()) {
+    if (!isRecord(message) || message.role !== "assistant" || !Array.isArray(message.content) || ![
+      "openai-responses",
+      "azure-openai-responses",
+      "openai-codex-responses"
+    ].includes(String(message.api)))
+      continue;
+    const payload = message.providerPayload;
+    if (!isRecord(payload) || payload.type !== "openaiResponsesHistory" || payload.dt !== true || !Array.isArray(payload.items))
+      continue;
+    if (saved === undefined) {
+      try {
+        saved = readDecisions(readReplayEnvelope(args.db, args.sessionId)[FIELD]);
+      } catch (error) {
+        sessionLog2(args.sessionId, `native tag replay unavailable; retaining native history: ${String(error)}`);
+        return 0;
+      }
+    }
+    if (!args.canApply && saved.size === 0)
+      return 0;
+    const frozen = saved;
+    const content = message.content;
+    const nativeItems = payload.items;
+    const decisions = {};
+    let changed = false;
+    const items = nativeItems.map((item) => {
+      if (!isRecord(item) || item.type !== "message" || item.role !== "assistant" || item.phase !== undefined && item.phase !== "commentary" && item.phase !== "final_answer" || !Array.isArray(item.content) || item.content.length !== 1)
+        return item;
+      const output = item.content[0];
+      if (!isRecord(output) || output.type !== "output_text" || typeof output.text !== "string" || !TAG.test(output.text))
+        return item;
+      if (nativeItems.filter((other) => isRecord(other) && other.id === item.id && other.phase === item.phase).length !== 1)
+        return item;
+      const key = nativeResponseTagStripKey(item.id, item.phase, output.text);
+      if (!frozen.has(key)) {
+        if (!args.canApply)
+          return item;
+        const blocks = content.filter((block) => {
+          const identity = signature(block);
+          return identity && identity.id === item.id && identity.phase === item.phase;
+        });
+        const block = blocks[0];
+        if (blocks.length !== 1 || !isRecord(block) || block.type !== "text" || typeof block.text !== "string" || block.text.replace(TAG, "") !== output.text.replace(TAG, ""))
+          return item;
+        added.add(key);
+      }
+      decisions[key] = output.text;
+      changed = true;
+      return {
+        ...item,
+        content: [{ ...output, text: output.text.replace(TAG, "") }]
+      };
+    });
+    if (changed)
+      pending.set(index, {
+        ...message,
+        [PI_NATIVE_TAG_STRIP_PROVENANCE]: decisions,
+        providerPayload: { ...payload, items }
+      });
+  }
+  if (added.size > 0) {
+    const persisted = updateReplayDocument(args.db, args.sessionId, (doc) => {
+      const decisions = readDecisions(doc[FIELD]);
+      for (const key of added)
+        decisions.add(key);
+      doc.version = 2;
+      doc[FIELD] = [...decisions];
+      return true;
+    });
+    if (!persisted)
+      throw new Error("Could not persist Responses tag strips");
+  }
+  for (const [index, message] of pending)
+    args.messages[index] = message;
+  return added.size;
+}
+
 // src/note-visibility-pi.ts
 var NOTE_TOOL_NAME = "ctx_note";
 var READ_ACTION = "read";
@@ -36846,7 +37082,7 @@ function coldReplayable(items) {
   }
   return reasoning;
 }
-function piResponsesAssistantTexts(value, model, host, alternatives) {
+function piResponsesAssistantTexts(value, model, host, alternatives, frozenTagStrips) {
   const message = object10(value);
   if (!message || !Array.isArray(message.content))
     return;
@@ -36900,6 +37136,7 @@ function piResponsesAssistantTexts(value, model, host, alternatives) {
   ].includes(model?.api ?? "");
   let unsigned = false;
   let rewrittenText = false;
+  let allUnsignedFrozen = true;
   for (const value of payload.items) {
     const item = object10(value);
     if (item?.type === "reasoning")
@@ -36929,6 +37166,7 @@ function piResponsesAssistantTexts(value, model, host, alternatives) {
         if (!allowUnsigned || "textSignature" in block || stripped !== block.text.replace(/^§\d+§ /u, ""))
           return texts;
         unsigned = true;
+        allUnsignedFrozen &&= part.text === block.text && ownsNativeResponseTagStrip(frozenTagStrips, item.id, item.phase, part.text);
         rewrittenText ||= part.text !== stripped;
       }
       bound++;
@@ -36940,7 +37178,7 @@ function piResponsesAssistantTexts(value, model, host, alternatives) {
     for (const text of itemTexts)
       replay.push(textIdentity2(wellFormed2(text), item.phase));
   }
-  if (!output || bound !== blocks.length || unsigned && !rewrittenText)
+  if (!output || bound !== blocks.length || unsigned && !rewrittenText && !allUnsignedFrozen)
     return texts;
   if (unsigned && alternatives) {
     alternatives.fallback = texts;
@@ -37555,7 +37793,7 @@ function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
         continue;
       }
       const alternatives = {};
-      const texts = piResponsesAssistantTexts(projectedMessages[index], model, host, alternatives);
+      const texts = piResponsesAssistantTexts(projectedMessages[index], model, host, alternatives, object11(projectedMessages[index])?.[PI_NATIVE_TAG_STRIP_PROVENANCE]);
       if (!texts) {
         responsesMessages = undefined;
         break;
@@ -40059,7 +40297,7 @@ function createPiFallbackIndex() {
 }
 
 // src/pi-fit-reclaim.ts
-import { createHash as createHash12, randomUUID as randomUUID4 } from "node:crypto";
+import { createHash as createHash13, randomUUID as randomUUID4 } from "node:crypto";
 var pendingInput = new Set;
 var KEY2 = "piUpperEstimateReclaim";
 function piFitOverflowPossible(args) {
@@ -40095,7 +40333,7 @@ function piUpperReclaimCursor(args) {
     sessionId: args.sessionId,
     modelKey: args.modelKey,
     contextWindow: args.contextWindow ?? null,
-    head: head ? createHash12("sha256").update(JSON.stringify([
+    head: head ? createHash13("sha256").update(JSON.stringify([
       Buffer.from(head.cachedM0Bytes ?? []).toString("base64"),
       Buffer.from(head.cachedM1Bytes ?? []).toString("base64"),
       head.cachedM0MuralDataUrl ?? null
@@ -40182,7 +40420,7 @@ async function waitForPiHistorianInTurn(sessionId, remainingMs, wait) {
 }
 
 // src/pi-lkg-fit-envelope.ts
-import { createHash as createHash13 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 function readPiLkgFitEnvelope(ctx, pi, modelKey, frozen, wireSchema) {
   try {
     if (!modelKey || typeof pi.getAllTools !== "function")
@@ -40244,7 +40482,7 @@ function readPiLkgFitEnvelope(ctx, pi, modelKey, frozen, wireSchema) {
       refusalToolDefinitionTokens,
       toolDefinitionsMeasured: refusalToolDefinitionTokens !== undefined,
       envelopeBytes: Buffer.byteLength(envelopeJson),
-      envelopeSignature: activeNames ? createHash13("sha256").update(envelopeJson).update(JSON.stringify(activeNames)).digest("hex") : undefined,
+      envelopeSignature: activeNames ? createHash14("sha256").update(envelopeJson).update(JSON.stringify(activeNames)).digest("hex") : undefined,
       calibration
     };
   } catch {
@@ -40253,13 +40491,13 @@ function readPiLkgFitEnvelope(ctx, pi, modelKey, frozen, wireSchema) {
 }
 
 // src/pi-message-identity.ts
-import { createHash as createHash16 } from "node:crypto";
+import { createHash as createHash17 } from "node:crypto";
 
 // src/pi-tool-identity.ts
-import { createHash as createHash15 } from "node:crypto";
+import { createHash as createHash16 } from "node:crypto";
 
 // src/served-array-ledger.ts
-import { createHash as createHash14 } from "node:crypto";
+import { createHash as createHash15 } from "node:crypto";
 import {
   closeSync as closeSync2,
   fstatSync,
@@ -40537,7 +40775,7 @@ function getPiLastServedArray(sessionId) {
   return previous ? `[${previous.serializedMessages.join(",")}]` : undefined;
 }
 function sha256(value) {
-  return createHash14("sha256").update(value).digest("hex");
+  return createHash15("sha256").update(value).digest("hex");
 }
 function safeSessionFileStem(sessionId) {
   const readable = sessionId.replace(/[^A-Za-z0-9._-]/g, "_").slice(0, 96);
@@ -40822,7 +41060,7 @@ function readPiServedCachedArray(sessionId) {
   const memory = getPiLastServedArray(sessionId);
   const slot = memory === undefined ? getSlot(sessionId) : undefined;
   const jsonPrefix = memory ?? slot?.jsonPrefix;
-  if (jsonPrefix === undefined || createHash15("sha256").update(jsonPrefix).digest("hex") !== getPiLastServedDigest(sessionId))
+  if (jsonPrefix === undefined || createHash16("sha256").update(jsonPrefix).digest("hex") !== getPiLastServedDigest(sessionId))
     return;
   let parsed;
   try {
@@ -40846,7 +41084,7 @@ function piMessageEntryFingerprint(message) {
   const m = message;
   if (typeof m.role !== "string")
     return null;
-  const contentHash = createHash16("sha256").update(stableStringify(m.content)).digest("hex");
+  const contentHash = createHash17("sha256").update(stableStringify(m.content)).digest("hex");
   return JSON.stringify([
     typeof m.responseId === "string" ? m.responseId : null,
     typeof m.timestamp === "number" || typeof m.timestamp === "string" ? m.timestamp : null,
@@ -45803,6 +46041,21 @@ function registerPiContextHandler(pi, baseOptions) {
           });
         }
       }
+      if (options.autoSearch && !options.autoSearch.enabled && !options.compactionOff && result.prefixMutationAllowed) {
+        await runAutoSearchHintForPi({
+          sessionId,
+          db: options.db,
+          messages: outputMessages,
+          entryIds: strictEntryIds,
+          entryIdByRef: result.postCommitEntryIdByRef,
+          options: {
+            enabled: false,
+            scoreThreshold: options.autoSearch.scoreThreshold,
+            minPromptChars: options.autoSearch.minPromptChars,
+            projectPath: projectIdentity
+          }
+        });
+      }
       logTransformTiming(sessionId, "autoSearch", tAutoSearch);
       const tTodoCapture = performance.now();
       const injectTodo = () => {
@@ -47521,9 +47774,11 @@ async function runPipeline(args) {
   afterFallbackAdoptionForTests?.(args.stableIdSchemeCutover === true);
   const textIdentityPlan = buildPiTextIdentityPlan(args.db, args.sessionId, args.tagger, transcript, args.reusableMessageIds);
   const tTag = performance.now();
+  const strippedSubagentThinking = args.sessionMeta.isSubagent && (!thinkingRecovery.restore || rewritingSignedPrefix) ? frozenBindingEntryIds(args.db, args.sessionId) : new Set;
   const mutationView = transcript.messages.map((message) => ({
     ...message,
-    parts: message.parts
+    parts: message.parts,
+    requiresToolArcSkeleton: strippedSubagentThinking.has(message.info.id ?? "") ? false : message.requiresToolArcSkeleton
   }));
   const recoveryNormalized = !!args.recoveryPrefix && (isCacheBustingPass || identityRebuild);
   const taggingView = args.recoveryPrefix && !recoveryNormalized ? mutationView.filter((message) => !args.recoveryPrefix?.untaggedInputIds.has(message.info.id ?? "")) : mutationView;
@@ -47659,6 +47914,31 @@ async function runPipeline(args) {
     }
   }
   logTransformTiming(args.sessionId, "convertLegacyToolSkeletons", tLegacyToolConversion);
+  if (args.sessionMeta.isSubagent && isCacheBustingPass && !protectedSignedPrefix && !args.compactionOff) {
+    const savedRemovalInputs = nativeRemovalInputs;
+    try {
+      nativeRemovalInputs = savedRemovalInputs && new Map(savedRemovalInputs);
+      const converted = args.db.transaction(() => removalBatch((flush) => {
+        const conversions = prepareAgedToolSkeletonConversions(args.db, args.sessionId, newTargets, {
+          prepareRemovals: (rows) => preparePiToolRemovalChecks({
+            db: args.db,
+            rows,
+            targets: newTargets,
+            messages: args.messages,
+            prepare: transcript.prepareToolRemovalMeasurements
+          })
+        });
+        conversions.persist(args.db);
+        flush();
+        return conversions.converted.size;
+      })).immediate();
+      if (converted > 0)
+        recordFirstApplicationWireEdit(true);
+    } catch (error) {
+      nativeRemovalInputs = savedRemovalInputs;
+      throw error;
+    }
+  }
   try {
     if (!args.sessionMeta.isSubagent) {
       const hasRecentCommit = detectRecentCommit(args.messages);
@@ -48175,6 +48455,13 @@ async function runPipeline(args) {
   const tTranscriptCommit = performance.now();
   transcript.commit();
   logTransformTiming(args.sessionId, "transcriptCommit", tTranscriptCommit);
+  if (applyNativeResponseTagReplayPi({
+    db: args.db,
+    sessionId: args.sessionId,
+    messages: args.messages,
+    canApply: isCacheBustingPass
+  }) > 0)
+    recordFirstApplicationWireEdit(true);
   let nativeInputs;
   let nativeReasoningIds;
   try {