@hassangameryt/freeflow 0.6.0 → 0.7.1

package/pi-extension/dist/cognitive-routing/controller.js

@@ -1,7 +1,9 @@
 import { randomUUID } from "node:crypto";
 import { readCognitiveRoutingHistory } from "./history.js";
+import { PI_SESSION_MODEL_STATE_ENTRY, parsePiSessionModelStateCommit } from "./pi-session-control.js";
 export const COGNITIVE_ROUTING_INTENT_ENTRY = "freeflow-cognitive-routing-intent";
 export const COGNITIVE_ROUTING_CONTROL_ENTRY = "freeflow-cognitive-routing-control";
+export const COGNITIVE_ROUTING_INACTIVE_ENTRY = "freeflow-cognitive-routing-inactive";
 function isProfileName(value) {
   return value === "standard" || value === "reasoning";
 }
@@ -42,18 +44,44 @@ function asPair(value) {
     thinkingLevel: candidate.thinkingLevel,
   };
 }
+function hostPairFromEntry(entry) {
+  if (entry.type === "model_state_change") {
+    return asPair({
+      provider: entry.provider,
+      modelId: entry.modelId,
+      thinkingLevel: entry.thinkingLevel,
+    });
+  }
+  if (entry.type !== "custom" || entry.customType !== PI_SESSION_MODEL_STATE_ENTRY) return undefined;
+  const commit = parsePiSessionModelStateCommit(entry.data);
+  if (!commit || commit.phase !== "committed" || commit.status !== "applied") return undefined;
+  return commit.target;
+}
+function hostCorrelationIdFromEntry(entry) {
+  if (entry.type === "model_state_change") {
+    return typeof entry.correlationId === "string" ? entry.correlationId : undefined;
+  }
+  if (entry.type !== "custom" || entry.customType !== PI_SESSION_MODEL_STATE_ENTRY) return undefined;
+  const commit = parsePiSessionModelStateCommit(entry.data);
+  return commit?.phase === "committed" && commit.status === "applied" ? commit.correlationId : undefined;
+}
+function latestPiSessionCommit(entries, correlationId) {
+  for (let index = entries.length - 1; index >= 0; index -= 1) {
+    const entry = entries[index];
+    if (!entry || typeof entry !== "object") continue;
+    const candidate = entry;
+    if (candidate.type !== "custom" || candidate.customType !== PI_SESSION_MODEL_STATE_ENTRY) continue;
+    const commit = parsePiSessionModelStateCommit(candidate.data);
+    if (commit?.correlationId === correlationId) return commit;
+  }
+  return undefined;
+}
 function latestHostPair(context) {
   const entries = branchEntriesFrom(context);
   for (let index = entries.length - 1; index >= 0; index -= 1) {
     const entry = entries[index];
     if (!entry || typeof entry !== "object") continue;
-    const candidate = entry;
-    if (candidate.type !== "model_state_change") continue;
-    const pair = asPair({
-      provider: candidate.provider,
-      modelId: candidate.modelId,
-      thinkingLevel: candidate.thinkingLevel,
-    });
+    const pair = hostPairFromEntry(entry);
     if (pair) return pair;
   }
   return undefined;
@@ -74,6 +102,17 @@ function profileNameForPair(capabilityState, pair) {
   }
   return undefined;
 }
+function pairMatchesProfile(capabilityState, pair, profileName) {
+  const profile = capabilityState.resolvedProfiles[profileName];
+  return Boolean(
+    profile &&
+    pairEquals(pair, {
+      provider: profile.provider,
+      modelId: profile.model,
+      thinkingLevel: profile.effectiveThinkingLevel,
+    }),
+  );
+}
 function asIntent(value) {
   if (!value || typeof value !== "object") return undefined;
   const candidate = value;
@@ -102,6 +141,9 @@ function asIntent(value) {
       : {}),
     ...(fromPair ? { fromPair } : {}),
     ...(isProfileName(candidate.fromProfile) ? { fromProfile: candidate.fromProfile } : {}),
+    ...(candidate.fromControl === "automatic" || candidate.fromControl === "manual"
+      ? { fromControl: candidate.fromControl }
+      : {}),
     ...(typeof candidate.reason === "string" ? { reason: candidate.reason } : {}),
     ...(typeof candidate.branchId === "string" || candidate.branchId === null ? { branchId: candidate.branchId } : {}),
     epoch: candidate.epoch,
@@ -116,6 +158,38 @@ function asIntent(value) {
     returnTarget,
   };
 }
+function asInactiveEntry(value) {
+  if (!value || typeof value !== "object") return undefined;
+  const candidate = value;
+  const pair = asPair(candidate.pair);
+  if (
+    candidate.version !== 1 ||
+    candidate.source !== "user" ||
+    typeof candidate.reason !== "string" ||
+    candidate.reason.length === 0 ||
+    !pair
+  ) {
+    return undefined;
+  }
+  return {
+    version: 1,
+    source: "user",
+    reason: candidate.reason,
+    ...(typeof candidate.branchId === "string" || candidate.branchId === null ? { branchId: candidate.branchId } : {}),
+    pair,
+  };
+}
+function latestInactiveEntry(entries) {
+  for (let index = entries.length - 1; index >= 0; index -= 1) {
+    const candidate = entries[index];
+    if (!candidate || typeof candidate !== "object") continue;
+    const record = candidate;
+    if (record.type !== "custom" || record.customType !== COGNITIVE_ROUTING_INACTIVE_ENTRY) continue;
+    const entry = asInactiveEntry(record.data);
+    if (entry) return { entry, position: index };
+  }
+  return undefined;
+}
 function entriesFrom(context) {
   try {
     const entries = context.sessionManager?.getEntries?.();
@@ -177,21 +251,92 @@ function latestControlMode(entries, intent) {
     }
     if (candidate.customType !== COGNITIVE_ROUTING_INTENT_ENTRY) continue;
     const candidateIntent = asIntent(candidate.data);
-    if (!candidateIntent || candidateIntent.phase !== "prepared" || candidateIntent.epoch !== intent.epoch) continue;
+    if (!candidateIntent || candidateIntent.epoch !== intent.epoch) continue;
+    if (candidateIntent.phase === "abandoned") {
+      if (candidateIntent.fromControl === "manual" && candidateIntent.fromProfile) {
+        return `manual-${candidateIntent.fromProfile}`;
+      }
+      if (candidateIntent.fromControl === "automatic") return "automatic";
+      continue;
+    }
     if (candidateIntent.kind === "profile" || candidateIntent.kind === "activation") {
       return controlModeForIntent(candidateIntent);
     }
   }
   return "automatic";
 }
+function intentEntryIndex(entries, intent) {
+  for (let index = 0; index < entries.length; index += 1) {
+    const entry = entries[index];
+    if (!entry || typeof entry !== "object") continue;
+    const candidate = entry;
+    if (candidate.type !== "custom" || candidate.customType !== COGNITIVE_ROUTING_INTENT_ENTRY) continue;
+    const parsed = asIntent(candidate.data);
+    if (parsed?.correlationId === intent.correlationId && parsed.phase === "prepared") return index;
+  }
+  return entries.length;
+}
+function matchesBaseline(candidate, failed) {
+  if (failed.fromPair && !pairEquals(candidate.target, failed.fromPair)) return false;
+  if (failed.fromProfile && candidate.profile !== failed.fromProfile) return false;
+  return true;
+}
+export function resolveControlBeforeIntent(entries, intent) {
+  if (intent.fromControl === "automatic") return "automatic";
+  if (intent.fromControl === "manual") {
+    return intent.fromProfile ? `manual-${intent.fromProfile}` : undefined;
+  }
+  const priorEntries = entries.slice(0, intentEntryIndex(entries, intent));
+  const abandonedCorrelations = new Set();
+  for (const entry of priorEntries) {
+    if (!entry || typeof entry !== "object") continue;
+    const candidate = entry;
+    if (candidate.type !== "custom" || candidate.customType !== COGNITIVE_ROUTING_INTENT_ENTRY) continue;
+    const parsed = asIntent(candidate.data);
+    if (parsed?.phase === "abandoned") abandonedCorrelations.add(parsed.correlationId);
+  }
+  let resolved;
+  for (const entry of priorEntries) {
+    if (!entry || typeof entry !== "object") continue;
+    const candidate = entry;
+    if (candidate.type !== "custom") continue;
+    if (candidate.customType === COGNITIVE_ROUTING_CONTROL_ENTRY) {
+      const data = candidate.data;
+      if (
+        data &&
+        typeof data === "object" &&
+        (data.version === 1 || data.version === 2) &&
+        data.epoch === intent.epoch &&
+        data.control === "automatic"
+      ) {
+        resolved = "automatic";
+      }
+      continue;
+    }
+    if (candidate.customType !== COGNITIVE_ROUTING_INTENT_ENTRY) continue;
+    const parsed = asIntent(candidate.data);
+    if (
+      !parsed ||
+      parsed.phase !== "prepared" ||
+      parsed.epoch !== intent.epoch ||
+      abandonedCorrelations.has(parsed.correlationId) ||
+      (parsed.kind !== "profile" && parsed.kind !== "activation") ||
+      !hasMatchingHostEntry(priorEntries, parsed) ||
+      !matchesBaseline(parsed, intent)
+    ) {
+      continue;
+    }
+    resolved = controlModeForIntent(parsed);
+  }
+  return resolved;
+}
 function hasMatchingHostEntry(entries, intent) {
   return entries.some((entry) => {
     if (!entry || typeof entry !== "object") return false;
     const candidate = entry;
     return (
-      candidate.type === "model_state_change" &&
-      candidate.correlationId === intent.correlationId &&
-      pairEquals(asPair(candidate), intent.target)
+      hostCorrelationIdFromEntry(candidate) === intent.correlationId &&
+      pairEquals(hostPairFromEntry(candidate), intent.target)
     );
   });
 }
@@ -199,30 +344,49 @@ export class CognitiveRoutingController {
   capabilityState;
   pi;
   ctx;
+  initialSessionStart;
   label;
   idFactory;
+  liveStateAuthoritative;
   lease;
   activeProfile;
   epoch;
   returnTarget;
   controlMode = "automatic";
+  nativeInactiveReason;
+  nativeBlockedReason;
+  transitionInFlight = false;
   branchPending = false;
   operation = Promise.resolve();
   constructor(options) {
     this.capabilityState = options.capabilityState;
     this.pi = options.pi;
     this.ctx = options.ctx;
+    this.initialSessionStart = options.initialSessionStart;
     this.label = options.label ?? "Cognitive Routing";
     this.idFactory = options.idFactory ?? randomUUID;
+    this.liveStateAuthoritative = options.liveStateAuthoritative === true;
   }
   state() {
-    const hostPair = latestHostPair(this.ctx);
-    const observedPair = hostPair ?? this.currentPair();
+    const hostPair = this.liveStateAuthoritative ? undefined : latestHostPair(this.ctx);
+    const observedPair = this.liveStateAuthoritative ? this.currentPair() : (hostPair ?? this.currentPair());
     const observedProfile = this.activeProfile ? profileNameForPair(this.capabilityState, observedPair) : undefined;
-    const activeProfile = hostPair ? observedProfile : (observedProfile ?? this.activeProfile);
+    const activeProfile = this.liveStateAuthoritative
+      ? observedProfile
+      : hostPair
+        ? observedProfile
+        : (observedProfile ?? this.activeProfile);
+    const effective = this.lease !== undefined && activeProfile !== undefined && !this.branchPending;
     return {
-      effective: this.lease !== undefined && activeProfile !== undefined && !this.branchPending,
+      effective,
       controlMode: this.controlMode,
+      ...(this.nativeBlockedReason
+        ? { runtimeStatus: "blocked", runtimeReason: this.nativeBlockedReason }
+        : this.nativeInactiveReason
+          ? { runtimeStatus: "inactive", runtimeReason: this.nativeInactiveReason }
+          : effective
+            ? { runtimeStatus: "active" }
+            : {}),
       ...(activeProfile ? { activeProfile } : {}),
       ...(this.epoch ? { epoch: this.epoch } : {}),
       ...(this.returnTarget ? { returnTarget: { ...this.returnTarget } } : {}),
@@ -273,13 +437,69 @@ export class CognitiveRoutingController {
   async reconcileBranch(mechanism = "session-tree") {
     return this.enqueue(() => this._reconcileBranch(mechanism));
   }
-  async _activate() {
+  async observeNativeChange(reason, source = undefined) {
+    if (this.transitionInFlight || source === "restore") return { status: "ignored" };
+    return this.enqueue(() => this._observeNativeChange(reason, source));
+  }
+  async reconcileLiveState(reason = "Pi model state diverged") {
+    if (this.transitionInFlight) return { status: "ignored" };
+    return this.enqueue(() => this._observeNativeChange(reason));
+  }
+  recordNativeInactive(reason, pair) {
+    try {
+      this.pi.appendEntryDurable(COGNITIVE_ROUTING_INACTIVE_ENTRY, {
+        version: 1,
+        source: "user",
+        reason,
+        branchId: this.currentBranchId(),
+        pair,
+      });
+    } catch {
+      this.nativeInactiveReason = undefined;
+      this.nativeBlockedReason = "inactive_state_persistence_failed";
+      return { status: "blocked", reason: this.nativeBlockedReason };
+    }
+    this.nativeInactiveReason = reason;
+    this.nativeBlockedReason = undefined;
+    return { status: "inactive", reason };
+  }
+  async _observeNativeChange(reason, source = undefined) {
+    if (!this.lease || !this.activeProfile) return { status: "ignored" };
+    const profile = this.capabilityState.resolvedProfiles[this.activeProfile];
+    const current = this.currentPair();
+    const expected = profile
+      ? {
+          provider: profile.provider,
+          modelId: profile.model,
+          thinkingLevel: profile.effectiveThinkingLevel,
+        }
+      : undefined;
+    if (current && expected && pairEquals(current, expected) && source !== "set") return { status: "ignored" };
+    const lease = this.lease;
+    if (!current) {
+      await this.releaseLease(lease);
+      this.clearActiveState();
+      this.nativeBlockedReason = "native_state_unavailable";
+      return { status: "blocked", reason: this.nativeBlockedReason };
+    }
+    const result = this.recordNativeInactive(reason, current);
+    await this.releaseLease(lease);
+    this.clearActiveState();
+    return result;
+  }
+  async _activate(allowInactive = false, requestedProfile, requestedControlMode) {
     if (this.state().effective && this.activeProfile) {
       return { status: "active", profile: this.activeProfile };
     }
     if (!this.capabilityState.effective) {
       return { status: "inactive", reason: "not_effective" };
     }
+    if ((this.nativeInactiveReason || this.nativeBlockedReason) && !allowInactive) {
+      return {
+        status: "inactive",
+        reason: this.nativeBlockedReason ? "runtime_blocked" : "native_override",
+      };
+    }
     const sessionEntries = entriesFrom(this.ctx);
     const lifecycleIntent = latestIntent(
       sessionEntries,
@@ -288,7 +508,10 @@ export class CognitiveRoutingController {
     if (lifecycleIntent && !hasMatchingHostEntry(sessionEntries, lifecycleIntent)) {
       return { status: "inactive", reason: "pending_intent" };
     }
-    if (lifecycleIntent?.kind === "activation") {
+    if (
+      lifecycleIntent?.kind === "activation" &&
+      !(allowInactive && (this.nativeInactiveReason || this.nativeBlockedReason))
+    ) {
       return { status: "inactive", reason: "recover_required" };
     }
     const preservedReload = lifecycleIntent?.kind === "closing" && lifecycleIntent.resumeProfile !== undefined;
@@ -301,17 +524,29 @@ export class CognitiveRoutingController {
     }
     const epoch = this.epoch ?? this.idFactory();
     const branchId = this.currentBranchId();
-    const sessionStart = this.capabilityState.sessionStart ?? {
-      control: "automatic",
-      profile: "standard",
-    };
-    const profileName = preservedReload ? lifecycleIntent.resumeProfile : sessionStart.profile;
+    const sessionStart = this.initialSessionStart ??
+      this.capabilityState.sessionStart ?? {
+        control: "automatic",
+        profile: "reasoning",
+      };
+    let profileName;
+    if (requestedProfile) {
+      profileName = requestedProfile;
+    } else if (preservedReload) {
+      profileName = lifecycleIntent.resumeProfile;
+    } else if (sessionStart.control === "automatic") {
+      profileName = "reasoning";
+    } else {
+      profileName = sessionStart.profile;
+    }
     const profile = this.capabilityState.resolvedProfiles[profileName];
     if (!profile) {
       return { status: "inactive", reason: preservedReload ? "resume_profile_unavailable" : "profile_unavailable" };
     }
     let controlMode;
-    if (preservedReload) {
+    if (requestedControlMode) {
+      controlMode = requestedControlMode;
+    } else if (preservedReload) {
       controlMode = lifecycleIntent.resumeControl === "manual" ? `manual-${profileName}` : "automatic";
     } else {
       controlMode = sessionStart.control === "manual" ? `manual-${profileName}` : "automatic";
@@ -365,7 +600,7 @@ export class CognitiveRoutingController {
           (candidate) => candidate.kind === "profile" && candidate.epoch === this.epoch,
         )
       : undefined;
-    const fromPair = latestHostPair(this.ctx) ?? this.currentPair();
+    const fromPair = this.observedHostPair();
     const fromProfile = this.activeProfile ?? profileNameForPair(this.capabilityState, fromPair);
     const intent = this.prepareIntent({
       kind: "closing",
@@ -392,7 +627,7 @@ export class CognitiveRoutingController {
     }
     this.clearActiveState(false);
     try {
-      const result = await lease.setState({ ...returnTarget, correlationId: intent.correlationId });
+      const result = await this.setState(lease, { ...returnTarget, correlationId: intent.correlationId });
       if (result.status !== "applied" && result.status !== "unchanged") {
         return { status: "inactive", reason: "restore_rejected" };
       }
@@ -403,9 +638,122 @@ export class CognitiveRoutingController {
       await this.releaseLease(lease);
     }
   }
+  async recoverTerminalIntent(intent) {
+    const commit = latestPiSessionCommit(branchEntriesFrom(this.ctx), intent.correlationId);
+    if (!commit) return undefined;
+    if (commit.phase === "prepared") {
+      if (!this.pi.recoverPreparedModelState) {
+        return { status: "pending", reason: "prepared_recovery_unsupported" };
+      }
+      let recovery;
+      try {
+        recovery = await this.pi.recoverPreparedModelState({
+          fromPair: commit.fromPair,
+          target: commit.target,
+          correlationId: commit.correlationId,
+        });
+      } catch {
+        return { status: "pending", reason: "prepared_recovery_failed" };
+      }
+      if (recovery.status === "rollback-failed") {
+        return { status: "pending", reason: "rollback_failed" };
+      }
+      if (recovery.status !== "restored") {
+        return { status: "pending", reason: "prepared_recovery_failed" };
+      }
+      try {
+        this.abandonPreparedIntent(intent, "Pi session transition interrupted.");
+      } catch {
+        return { status: "pending", reason: "intent_abandon_failed" };
+      }
+      const recovered = await this._recover();
+      return recovered.status === "inactive" && recovered.reason === "no_pending_intent"
+        ? { status: "inactive", reason: "intent_abandoned" }
+        : recovered;
+    }
+    if (commit.phase !== "aborted") return undefined;
+    if (commit.status === "rollback-failed") {
+      return { status: "pending", reason: "rollback_failed" };
+    }
+    try {
+      this.abandonPreparedIntent(intent, "Pi session transition rolled back.");
+    } catch {
+      return { status: "pending", reason: "intent_abandon_failed" };
+    }
+    return this._recover();
+  }
+  async recoverTerminalProfileIntent(intent) {
+    const commit = latestPiSessionCommit(branchEntriesFrom(this.ctx), intent.correlationId);
+    if (!commit || commit.phase === "committed") return undefined;
+    if (commit.phase === "aborted" && commit.status === "rollback-failed") {
+      return { status: "pending", reason: "rollback_failed" };
+    }
+    const controlMode = resolveControlBeforeIntent(branchEntriesFrom(this.ctx), intent);
+    if (
+      !controlMode ||
+      !intent.fromPair ||
+      !intent.fromProfile ||
+      !pairMatchesProfile(this.capabilityState, intent.fromPair, intent.fromProfile)
+    ) {
+      return { status: "pending", reason: "baseline_control_unknown" };
+    }
+    if (commit.phase === "prepared") {
+      if (!this.pi.recoverPreparedModelState) {
+        return { status: "pending", reason: "prepared_recovery_unsupported" };
+      }
+      let recovery;
+      try {
+        recovery = await this.pi.recoverPreparedModelState({
+          fromPair: commit.fromPair,
+          target: commit.target,
+          correlationId: commit.correlationId,
+        });
+      } catch {
+        return { status: "pending", reason: "prepared_recovery_failed" };
+      }
+      if (recovery.status === "rollback-failed") {
+        return { status: "pending", reason: "rollback_failed" };
+      }
+      if (recovery.status !== "restored") {
+        return { status: "pending", reason: "prepared_recovery_failed" };
+      }
+    }
+    try {
+      this.abandonPreparedIntent(intent, "Pi session transition interrupted or rolled back.");
+    } catch {
+      return { status: "pending", reason: "intent_abandon_failed" };
+    }
+    const recovered = await this.activatePrepared({
+      kind: "profile",
+      controlMode,
+      source: "system",
+      mechanism: "recovery",
+      ...(decisionCorrelationForIntent(intent) ? { decisionCorrelationId: decisionCorrelationForIntent(intent) } : {}),
+      branchId: this.currentBranchId(),
+      epoch: intent.epoch,
+      returnTarget: intent.returnTarget,
+      target: intent.fromPair,
+      profile: intent.fromProfile,
+    });
+    return recovered.status === "active" ? recovered : { status: "pending", reason: "baseline_recovery_failed" };
+  }
   async _recover() {
     const sessionEntries = entriesFrom(this.ctx);
     const branchEntries = branchEntriesFrom(this.ctx);
+    const inactive = latestInactiveEntry(branchEntries);
+    const branchLifecycleIntent = latestIntent(
+      branchEntries,
+      (intent) => intent.kind === "activation" || intent.kind === "closing",
+    );
+    if (
+      inactive &&
+      (!branchLifecycleIntent || intentEntryIndex(branchEntries, branchLifecycleIntent) <= inactive.position)
+    ) {
+      this.nativeInactiveReason = inactive.entry.reason;
+      this.nativeBlockedReason = undefined;
+      this.clearActiveState();
+      return { status: "inactive", reason: "native_override" };
+    }
     const lifecycleIntent = latestIntent(
       sessionEntries,
       (intent) => intent.kind === "activation" || intent.kind === "closing",
@@ -413,6 +761,10 @@ export class CognitiveRoutingController {
     if (!lifecycleIntent) {
       return { status: "inactive", reason: "no_pending_intent" };
     }
+    if (lifecycleIntent.kind === "activation") {
+      const lifecycleTerminal = await this.recoverTerminalIntent(lifecycleIntent);
+      if (lifecycleTerminal) return lifecycleTerminal;
+    }
     if (lifecycleIntent.kind === "closing") {
       return hasMatchingHostEntry(sessionEntries, lifecycleIntent)
         ? { status: "inactive", reason: "closed" }
@@ -433,6 +785,19 @@ export class CognitiveRoutingController {
       thinkingLevel: currentActivationProfile.effectiveThinkingLevel,
     };
     const activationMatched = hasMatchingHostEntry(sessionEntries, lifecycleIntent);
+    if (this.liveStateAuthoritative && activationMatched) {
+      const livePair = this.currentPair();
+      if (!livePair) {
+        this.clearActiveState();
+        this.nativeBlockedReason = "native_state_unavailable";
+        return { status: "inactive", reason: "native_override" };
+      }
+      if (!pairEquals(livePair, activationTarget)) {
+        this.recordNativeInactive("Pi model state diverged during recovery", livePair);
+        this.clearActiveState();
+        return { status: "inactive", reason: "native_override" };
+      }
+    }
     if (activationMatched && !pairEquals(activationTarget, lifecycleIntent.target)) {
       return { status: "pending", reason: "applied_target_changed" };
     }
@@ -442,7 +807,7 @@ export class CognitiveRoutingController {
     if (!activationMatched) {
       const retried = await this.activatePrepared({
         kind: "activation",
-        controlMode: "automatic",
+        controlMode: latestControlMode(branchEntries, lifecycleIntent),
         source: "system",
         mechanism: "recovery",
         branchId: this.currentBranchId(),
@@ -458,6 +823,8 @@ export class CognitiveRoutingController {
       (intent) => intent.kind === "profile" && intent.epoch === lifecycleIntent.epoch,
     );
     if (profileIntent) {
+      const terminal = await this.recoverTerminalProfileIntent(profileIntent);
+      if (terminal) return terminal;
       const currentProfile = this.capabilityState.resolvedProfiles[profileIntent.profile ?? "standard"];
       if (!currentProfile) {
         return this.abandonIntent(profileIntent, "Prepared profile is unavailable.");
@@ -491,7 +858,7 @@ export class CognitiveRoutingController {
     }
     return this.activatePrepared({
       kind: "activation",
-      controlMode: "automatic",
+      controlMode: latestControlMode(branchEntries, lifecycleIntent),
       source: "system",
       mechanism: "recovery",
       branchId: this.currentBranchId(),
@@ -502,7 +869,7 @@ export class CognitiveRoutingController {
     });
   }
   async recoverClosingIntent(intent) {
-    const fromPair = latestHostPair(this.ctx) ?? this.currentPair();
+    const fromPair = this.observedHostPair();
     const fromProfile = intent.fromProfile ?? profileNameForPair(this.capabilityState, fromPair);
     const retryIntent = this.prepareIntent({
       kind: "closing",
@@ -536,7 +903,10 @@ export class CognitiveRoutingController {
       return { status: "pending", reason: `closing_recovery_acquire_${acquisition.status}` };
     }
     try {
-      const result = await acquisition.lease.setState({ ...intent.target, correlationId: retryIntent.correlationId });
+      const result = await this.setState(acquisition.lease, {
+        ...intent.target,
+        correlationId: retryIntent.correlationId,
+      });
       return result.status === "applied" || result.status === "unchanged"
         ? { status: "inactive", reason: "restored" }
         : { status: "pending", reason: "closing_recovery_rejected" };
@@ -546,20 +916,23 @@ export class CognitiveRoutingController {
       await this.releaseLease(acquisition.lease);
     }
   }
+  abandonPreparedIntent(intent, reason) {
+    const fromPair = intent.fromPair ?? this.observedHostPair();
+    const fromProfile = intent.fromProfile ?? profileNameForPair(this.capabilityState, fromPair);
+    this.pi.appendEntryDurable(COGNITIVE_ROUTING_INTENT_ENTRY, {
+      ...intent,
+      version: 2,
+      phase: "abandoned",
+      source: "system",
+      mechanism: intent.mechanism ?? "recovery",
+      ...(fromPair ? { fromPair } : {}),
+      ...(fromProfile ? { fromProfile } : {}),
+      reason,
+    });
+  }
   async abandonIntent(intent, reason) {
     try {
-      const fromPair = intent.fromPair ?? latestHostPair(this.ctx) ?? this.currentPair();
-      const fromProfile = intent.fromProfile ?? profileNameForPair(this.capabilityState, fromPair);
-      this.pi.appendEntryDurable(COGNITIVE_ROUTING_INTENT_ENTRY, {
-        ...intent,
-        version: 2,
-        phase: "abandoned",
-        source: "system",
-        mechanism: intent.mechanism ?? "recovery",
-        ...(fromPair ? { fromPair } : {}),
-        ...(fromProfile ? { fromProfile } : {}),
-        reason,
-      });
+      this.abandonPreparedIntent(intent, reason);
       const recovered = await this._recover();
       return recovered.status === "inactive" && recovered.reason === "no_pending_intent"
         ? { status: "inactive", reason: "intent_abandoned" }
@@ -639,8 +1012,9 @@ export class CognitiveRoutingController {
     if (!this.capabilityState.effective) {
       return { status: "inactive", reason: "not_effective" };
     }
-    const activation = this.state().effective ? { status: "active" } : await this._activate();
-    if (activation.status !== "active") return activation;
+    if (!this.state().effective) {
+      return this._activate(true, profile, `manual-${profile}`);
+    }
     return this._setProfile(profile, {
       controlMode: `manual-${profile}`,
       source: "user",
@@ -671,7 +1045,7 @@ export class CognitiveRoutingController {
       modelId: resolvedProfile.model,
       thinkingLevel: resolvedProfile.effectiveThinkingLevel,
     };
-    const fromPair = latestHostPair(this.ctx) ?? this.currentPair();
+    const fromPair = this.observedHostPair();
     if (!fromPair) return { status: "inactive", reason: "current_state_unavailable" };
     const fromProfile = this.activeProfile ?? profileNameForPair(this.capabilityState, fromPair);
     const correlationId = this.idFactory();
@@ -686,6 +1060,7 @@ export class CognitiveRoutingController {
       ...(decisionCorrelationId ? { decisionCorrelationId } : {}),
       ...(fromPair ? { fromPair } : {}),
       ...(fromProfile ? { fromProfile } : {}),
+      fromControl: options.controlMode === "automatic" ? "automatic" : "manual",
       reason: options.reason,
       branchId: this.currentBranchId(),
       epoch: this.epoch,
@@ -714,8 +1089,27 @@ export class CognitiveRoutingController {
       return { status: "inactive", reason: "prepare_failed" };
     }
     try {
-      const result = await lease.setState({ ...target, correlationId: intent.correlationId });
+      const result = await this.setState(lease, { ...target, correlationId: intent.correlationId });
       if (result.status !== "applied" && result.status !== "unchanged") {
+        const commit = latestPiSessionCommit(branchEntriesFrom(this.ctx), intent.correlationId);
+        if (result.status === "rejected" && commit?.phase === "aborted" && commit.status === "rollback-failed") {
+          try {
+            this.abandonPreparedIntent(intent, "Pi session rollback failed.");
+          } catch {
+            // Fail closed even when the terminal abandonment cannot be persisted.
+          }
+          await this.releaseLease(lease);
+          this.clearActiveState();
+          return { status: "inactive", reason: "rollback_failed" };
+        }
+        if (result.status === "rejected" && commit?.phase === "aborted" && commit.status === "rolled-back") {
+          try {
+            this.abandonPreparedIntent(intent, "Pi session transition rolled back.");
+            this.branchPending = false;
+          } catch {
+            // Preserve the pending boundary when the terminal abandonment cannot be persisted.
+          }
+        }
         return { status: "inactive", reason: "transition_rejected" };
       }
       this.activeProfile = profile;
@@ -728,8 +1122,27 @@ export class CognitiveRoutingController {
   }
   async _setAutomaticControl(mechanism) {
     if (!this.lease || !this.epoch) {
-      return { status: "rejected", reason: "not_active" };
+      if (!this.nativeInactiveReason && !this.nativeBlockedReason) return { status: "rejected", reason: "not_active" };
+      const activation = await this._activate(true, this.profileForCurrentPair(), "automatic");
+      return activation.status === "active"
+        ? { status: "automatic" }
+        : { status: "rejected", reason: activation.reason };
+    }
+    const current = this.state();
+    if (!current.activeProfile) {
+      return { status: "rejected", reason: "profile_unknown" };
     }
+    if (current.activeProfile !== "reasoning") {
+      const transition = await this._setProfile("reasoning", {
+        controlMode: "automatic",
+        source: "user",
+        mechanism,
+        reason: "automatic control selects the Reasoning profile",
+      });
+      if (transition.status !== "active") return { status: "rejected", reason: transition.reason };
+      return { status: "automatic" };
+    }
+    if (this.controlMode === "automatic") return { status: "automatic" };
     try {
       this.pi.appendEntryDurable(COGNITIVE_ROUTING_CONTROL_ENTRY, {
         version: 2,
@@ -757,6 +1170,13 @@ export class CognitiveRoutingController {
       return undefined;
     }
   }
+  observedHostPair() {
+    const livePair = this.currentPair();
+    return this.liveStateAuthoritative ? livePair : (latestHostPair(this.ctx) ?? livePair);
+  }
+  profileForCurrentPair() {
+    return profileNameForPair(this.capabilityState, this.currentPair());
+  }
   currentPair() {
     const model = this.ctx.model;
     if (
@@ -777,7 +1197,7 @@ export class CognitiveRoutingController {
     return { version: 2, phase: "prepared", ...input };
   }
   async activatePrepared(options) {
-    const fromPair = latestHostPair(this.ctx) ?? this.currentPair();
+    const fromPair = this.observedHostPair();
     if (!fromPair) return { status: "inactive", reason: "current_state_unavailable" };
     const fromProfile = profileNameForPair(this.capabilityState, fromPair);
     const correlationId = this.idFactory();
@@ -816,7 +1236,7 @@ export class CognitiveRoutingController {
     }
     this.lease = acquisition.lease;
     try {
-      const result = await acquisition.lease.setState({ ...options.target, correlationId: intent.correlationId });
+      const result = await this.setState(acquisition.lease, { ...options.target, correlationId: intent.correlationId });
       if (result.status !== "applied" && result.status !== "unchanged") {
         await this.releaseLease(acquisition.lease);
         this.clearActiveState();
@@ -826,6 +1246,8 @@ export class CognitiveRoutingController {
       this.returnTarget = options.returnTarget;
       this.activeProfile = options.profile;
       this.controlMode = options.controlMode;
+      this.nativeInactiveReason = undefined;
+      this.nativeBlockedReason = undefined;
       return { status: "active", profile: options.profile };
     } catch {
       await this.releaseLease(acquisition.lease);
@@ -841,6 +1263,14 @@ export class CognitiveRoutingController {
     );
     return next;
   }
+  async setState(lease, request) {
+    this.transitionInFlight = true;
+    try {
+      return await lease.setState(request);
+    } finally {
+      this.transitionInFlight = false;
+    }
+  }
   async releaseLease(lease) {
     try {
       await lease.release();