nolo-cli 0.157.0 → 0.158.0

package/{chunk-NLFTBC6S.js → chunk-KQT46A27.js}

@@ -9,7 +9,7 @@ import {
   resolveRawAgentInput,
   resolveServerUrl,
   writeUsage
-} from "./chunk-FHG46N5C.js";
+} from "./chunk-3GCLICFW.js";
 import {
   getReadableCliDb
 } from "./chunk-62TBKWTV.js";
@@ -31,19 +31,19 @@ import {
   resolveFileWriteGateEnabled,
   resolveLocalUserId,
   validateInstaboxWorkspaceSelection
-} from "./chunk-ZKVS36H3.js";
+} from "./chunk-RCZMREV2.js";
 import {
   clearCredentialAvailability,
-  readCredentialEntry,
+  readEffectiveCredentialEntry,
   recordCredentialProbe
-} from "./chunk-6MXDOUMH.js";
+} from "./chunk-R4BMKAR5.js";
 import {
   agentRunCardLabels,
   getCliLocale,
   t,
   toolLabel,
   toolLabelVariants
-} from "./chunk-2AB2HA4M.js";
+} from "./chunk-TDX2L4W2.js";
 import {
   _appendEntityBatch,
   _appendEvidenceBatch,
@@ -79,14 +79,14 @@ import {
 } from "./chunk-BMQ2MJUK.js";
 import {
   resolveCliLocalRuntimeKeyCapability
-} from "./chunk-MR3ITQEV.js";
+} from "./chunk-M3IBEHBT.js";
 import {
   isTransientFetchError
 } from "./chunk-KFHREHUQ.js";
 import {
   parseUiCard,
   uiCardFallback
-} from "./chunk-K6Y5T4GE.js";
+} from "./chunk-Y7F4Q7YP.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
@@ -95,7 +95,7 @@ import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-B3ZIFOFI.js";
+} from "./chunk-TSTLLGAC.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   estimateMessagesTokens,
@@ -103,7 +103,7 @@ import {
   resolveAgentContextWindow,
   resolveOccupancy,
   resolveOccupancyWindow
-} from "./chunk-XZIW3Q5B.js";
+} from "./chunk-HSY7F4PP.js";
 import {
   buildSkillDiscoveryContextLayer
 } from "./chunk-AU7AXHUL.js";
@@ -115,10 +115,10 @@ import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-5E5VB7PS.js";
+} from "./chunk-TTVMMYVH.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-ULQAD7ZY.js";
+} from "./chunk-YKTAUOS7.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -133,16 +133,18 @@ import {
 import {
   PROBE_INTERVAL_MS,
   QUOTA_ERROR_PATTERNS,
+  classifyFailureSubclass,
+  isCapacitySaturatedRateLimit,
   isQuotaExhaustedError,
-  isQuotaLimited403Body,
+  isQuotaExhaustedText,
   mergeAvailabilityDeadline,
   resolveCooldownGate,
   resolveCredentialKeyWithFallback
-} from "./chunk-3MZAGMYY.js";
+} from "./chunk-JLR5NWP2.js";
 import {
   isOAuthApiKeyRef,
   normalizeUsage
-} from "./chunk-F3SOW2EU.js";
+} from "./chunk-HEC32F3G.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
@@ -11371,7 +11373,7 @@ function isBalanceExhaustedError(error) {
 
 // packages/cli/client/agentRun.ts
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-J6I63NZC.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-QL4SHNJJ.js");
   return runLocalAgentTurn;
 }
 var stripDebugNoise = (s) => s.replace(/\s*raw="[\s\S]*"/g, "").replace(/\s*raw=\S+/g, "").replace(/\s*headers=\[[^\]]*\]/g, "").replace(/\s*headers=\S+/g, "").trim();
@@ -11643,7 +11645,7 @@ function looksLikeRateLimitedText(message) {
 var AUTH_TEXT_SIGNAL_RE = /\b401\b|unauthori[sz]ed|invalid[_\s-]?(?:api[_\s-]?key|token|credential)s?|(?:api[_\s-]?key|token|credential)s?[_\s-](?:invalid|expired|rejected|missing|not[_\s-]?found)|authentication[_\s-]?(?:error|failed|required)/i;
 var QUOTA_EXHAUSTED_EXTRA_RE = /insufficient[_\s-]?(?:quota|balance|credits?)|余额不足|额度已?用尽/i;
 function looksLikeQuotaExhaustedText(message) {
-  return isQuotaLimited403Body(message) || QUOTA_EXHAUSTED_EXTRA_RE.test(message);
+  return isQuotaExhaustedText(message) || QUOTA_EXHAUSTED_EXTRA_RE.test(message);
 }
 var BARE_UPSTREAM_5XX_RE = /\bHTTP[:\s]+(5\d\d)\b|\bstatus[:\s=]+(5\d\d)\b|\breturned error\s+(5\d\d)\b/i;
 function classifyLocalRunError(message) {
@@ -11890,7 +11892,7 @@ function formatRateLimitResetHint(hint, locale) {
   return parts.join(" ");
 }
 function buildRateLimitFailure(ctx) {
-  const headlineKey = ctx.quotaExhausted ? "localRunRateLimitQuota" : "localRunRateLimitThrottled";
+  const headlineKey = isCapacitySaturatedRateLimit(ctx.message, Date.now()) ? "localRunRateLimitCapacity" : ctx.quotaExhausted ? "localRunRateLimitQuota" : "localRunRateLimitThrottled";
   const lines = [
     t(
       headlineKey,
@@ -12228,8 +12230,15 @@ async function runHttpAgentTurn(options, authToken) {
     if (options.abortSignal?.aborted) {
       return { exitCode: 0, streamInterrupted: true };
     }
+    const failureSubclass = classifyFailureSubclass({
+      message: toErrorMessage(error),
+      body: error
+    });
     options.output.write(buildTransportErrorHint(options.serverUrl, error));
-    return { exitCode: 1 };
+    return {
+      exitCode: 1,
+      ...failureSubclass && failureSubclass !== "unknown" ? { failureSubclass } : {}
+    };
   }
   if (shouldStream && isGatewayHttpStatus(res.status)) {
     const failureMeta = await readAgentRunFailureMetadata(res);
@@ -12244,8 +12253,15 @@ async function runHttpAgentTurn(options, authToken) {
         res = await postAgentRun(false);
       } catch (error) {
         spinner.stop();
+        const failureSubclass = classifyFailureSubclass({
+          message: toErrorMessage(error),
+          body: error
+        });
         options.output.write(buildTransportErrorHint(options.serverUrl, error));
-        return { exitCode: 1 };
+        return {
+          exitCode: 1,
+          ...failureSubclass && failureSubclass !== "unknown" ? { failureSubclass } : {}
+        };
       }
     }
   }
@@ -12293,7 +12309,16 @@ async function runHttpAgentTurn(options, authToken) {
 `
       );
     }
-    return dialogIdText ? { exitCode: 1, dialogId: dialogIdText } : { exitCode: 1 };
+    const failureSubclass = classifyFailureSubclass({
+      status: res.status,
+      message: `${errorText || messageText} ${reasonText || ""} ${codeText || ""}`.trim(),
+      body: data
+    });
+    return {
+      exitCode: 1,
+      ...dialogIdText ? { dialogId: dialogIdText } : {},
+      ...failureSubclass && failureSubclass !== "unknown" ? { failureSubclass } : {}
+    };
   }
   const content = formatAssistantResponseForCli(
     String(data?.content ?? data?.message ?? "")
@@ -12604,6 +12629,10 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
     return {
       exitCode: 1,
       localError: error,
+      failureSubclass: classifyFailureSubclass({
+        message: toErrorMessage(error),
+        body: error
+      }),
       ...savedDialogId ? { dialogId: savedDialogId } : {},
       ...abortedTurnCredits !== void 0 ? { turnCredits: abortedTurnCredits } : {},
       ...abortedUsageRecords?.length ? { usageRecords: abortedUsageRecords } : {}
@@ -12622,7 +12651,9 @@ async function checkLocalAvailabilityBeforeHttpDispatch(options) {
   }
   if (!config || typeof config !== "object") return null;
   const baseRecord = config.rawRecord ?? config;
-  let credentialKey = resolveCredentialKeyWithFallback(baseRecord);
+  let credentialKey = resolveCredentialKeyWithFallback(
+    baseRecord.agentKey || baseRecord.key ? baseRecord : { ...baseRecord, agentKey: options.agentKey }
+  );
   if (credentialKey && resolveOAuthChannelOwnerSkip(
     config,
     options
@@ -12636,19 +12667,30 @@ async function checkLocalAvailabilityBeforeHttpDispatch(options) {
   }
   const env = options.env;
   const now = Date.now();
-  const entry = credentialKey ? await readCredentialEntry(credentialKey, env, now).catch(() => void 0) : void 0;
+  let entry;
+  let matchedKey;
+  if (credentialKey) {
+    const effective = await readEffectiveCredentialEntry(credentialKey, env, now).catch(() => void 0);
+    if (effective) {
+      entry = effective;
+      matchedKey = effective.matchedKey;
+    }
+  }
   const entryAt = entry?.nextAvailableAt;
   const effectiveNextAvailableAt = typeof entryAt === "number" ? mergeAvailabilityDeadline(agentLevelNextAvailableAt, entryAt) : agentLevelNextAvailableAt;
-  if (typeof effectiveNextAvailableAt !== "number") return { credentialKey };
+  const activeKey = matchedKey || credentialKey;
+  if (typeof effectiveNextAvailableAt !== "number") {
+    return { credentialKey: credentialKey || activeKey, matchedKey };
+  }
   const gateDecision = resolveCooldownGate(
     { nextAvailableAt: effectiveNextAvailableAt, lastProbeAt: entry?.lastProbeAt },
     now
   );
-  if (gateDecision === "probe" && credentialKey) {
-    await recordCredentialProbe(credentialKey, env, now).catch(() => void 0);
-    return { credentialKey };
+  if (gateDecision === "probe" && activeKey) {
+    await recordCredentialProbe(activeKey, env, now).catch(() => void 0);
+    return { credentialKey: credentialKey || activeKey, matchedKey };
   }
-  if (gateDecision !== "blocked") return { credentialKey };
+  if (gateDecision !== "blocked") return { credentialKey: credentialKey || activeKey, matchedKey };
   options.output.write(
     `${t(
       "agentCooldownBlocked",
@@ -12659,7 +12701,7 @@ async function checkLocalAvailabilityBeforeHttpDispatch(options) {
     )}
 `
   );
-  return { exitCode: 1 };
+  return { exitCode: 1, failureSubclass: "rate_limit" };
 }
 function foldLocalResultForTui(localResult) {
   const folded = {
@@ -12685,7 +12727,8 @@ function foldLocalResultForTui(localResult) {
     // 上 finalText 永远到不了结算点 → agentRunCommand 的 settleRunTerminal-
     // Authoritatively 拿不到 lastAssistantText → `.result.md` 不写、status 无
     // resultFile，编排者只能去啃带 ANSI 的 .log（同坑位历史：turnCredits）。
-    ...localResult.finalText ? { finalText: localResult.finalText } : {}
+    ...localResult.finalText ? { finalText: localResult.finalText } : {},
+    ...localResult.failureSubclass ? { failureSubclass: localResult.failureSubclass } : {}
   };
   const headerMeta = getRunResultHeaderMeta(localResult);
   recordRunResultHeaderMeta(folded, headerMeta);
@@ -12760,9 +12803,14 @@ async function runAgentTurn(options) {
         }
       }
       const localErrorMessage = localResult.localError ? toErrorMessage(localResult.localError) : "local runtime failed";
+      const failureSubclass = localResult.failureSubclass ?? classifyFailureSubclass({
+        message: localErrorMessage,
+        body: localResult.localError
+      });
       options.output.write(describeLocalRunFailure(localErrorMessage, localResult.localError));
       return {
         exitCode: 1,
+        failureSubclass,
         ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
         // Keep localError so TUI can show balance/quota/dialog-preserved hints
         // instead of only the raw auto-runtime line.
@@ -12782,12 +12830,16 @@ async function runAgentTurn(options) {
   }
   const localAvailability = await checkLocalAvailabilityBeforeHttpDispatch(options);
   if (localAvailability?.exitCode) {
-    return { exitCode: localAvailability.exitCode };
+    return {
+      exitCode: localAvailability.exitCode,
+      failureSubclass: localAvailability.failureSubclass ?? "rate_limit"
+    };
   }
   const httpResult = await runHttpAgentTurn(options, authToken);
-  if (httpResult.exitCode === 0 && !httpResult.streamInterrupted && localAvailability?.credentialKey) {
+  if (httpResult.exitCode === 0 && !httpResult.streamInterrupted && (localAvailability?.credentialKey || localAvailability?.matchedKey)) {
+    const keyToClear = localAvailability.credentialKey || localAvailability.matchedKey;
     await clearCredentialAvailability(
-      localAvailability.credentialKey,
+      keyToClear,
       options.env
     ).catch(() => void 0);
   }

package/{chunk-MR3ITQEV.js → chunk-M3IBEHBT.js}

@@ -1,7 +1,7 @@
 import {
   assembleAgentDiscoveryResult,
   resolveDiscoveryScope
-} from "./chunk-WYJTNSVL.js";
+} from "./chunk-Y45LLH6C.js";
 import {
   fetchWithTransientRetry
 } from "./chunk-KFHREHUQ.js";
@@ -20,7 +20,7 @@ import {
   toolRunUpdated,
   uiCardFallback,
   waitForAbortableDelay
-} from "./chunk-K6Y5T4GE.js";
+} from "./chunk-Y7F4Q7YP.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
@@ -64,7 +64,7 @@ import {
 } from "./chunk-VF4K2QE6.js";
 import {
   createDocState
-} from "./chunk-6Y3ETA2Y.js";
+} from "./chunk-323QA7RW.js";
 import {
   addMemberSpace,
   fetchAuthoritativeRemoteSpace,
@@ -79,7 +79,7 @@ import {
 } from "./chunk-BAWAKW7X.js";
 import {
   createDialogAction
-} from "./chunk-B3ZIFOFI.js";
+} from "./chunk-TSTLLGAC.js";
 import {
   setDialogExtraReferencesAction
 } from "./chunk-IF7V3CBU.js";
@@ -102,7 +102,7 @@ import {
   updateContentCategory,
   updateContentTitle,
   writeStoredCollapsedCategories
-} from "./chunk-IKOKYBYJ.js";
+} from "./chunk-OHRQXEON.js";
 import {
   buildDatabaseFileContentUrl,
   deleteDialog,
@@ -115,7 +115,7 @@ import {
   selectMsgById,
   uiAskChoiceFunc,
   uiAskChoiceFunctionSchema
-} from "./chunk-XZIW3Q5B.js";
+} from "./chunk-HSY7F4PP.js";
 import {
   buildMediaToolConfirmation,
   normalizeMediaConfirmExecutionRevision
@@ -126,7 +126,7 @@ import {
   runLlm,
   streamAgentChatTurn,
   updateAgent
-} from "./chunk-R7GCGOGZ.js";
+} from "./chunk-OE4FM66I.js";
 import {
   getCurrentSpaceId,
   getCurrentSpaceIdRaw,
@@ -3882,7 +3882,7 @@ async function deleteDialogsFunc(args, thunkApi) {
   const deletedDialogIds = [];
   const deletedDialogKeys = [];
   const failures = [];
-  const { deleteDialog: deleteDialog2 } = await import("./dialogSlice-WJEEPG4W.js");
+  const { deleteDialog: deleteDialog2 } = await import("./dialogSlice-SOEMTPH4.js");
   for (const target of targets) {
     try {
       await thunkApi.dispatch(deleteDialog2(target.dbKey)).unwrap();
@@ -18563,7 +18563,7 @@ async function updateDocFunc(args, thunkApi) {
       updated_at: (/* @__PURE__ */ new Date()).toISOString()
     };
     await dispatch(write({ data: updatedPageData, customKey: id })).unwrap();
-    const { getDocState, applyExternalDocUpdate } = await import("./docStore-7JPYT25V.js");
+    const { getDocState, applyExternalDocUpdate } = await import("./docStore-YXIN3UVQ.js");
     if (getDocState().pageKey === id) {
       applyExternalDocUpdate({
         slateData: finalSlateData,

package/{chunk-R7GCGOGZ.js → chunk-OE4FM66I.js}

@@ -308,7 +308,7 @@ var slice = createSliceWithThunks({
       const overrides = {};
       if (args.systemPromptOverride !== void 0) overrides.prompt = args.systemPromptOverride;
       if (args.toolsOverride !== void 0) overrides.tools = args.toolsOverride;
-      const { _executeModel } = await import("./_executeModel-ZIQHOREX.js");
+      const { _executeModel } = await import("./_executeModel-AGVQAILR.js");
       return _executeModel(
         {
           isStreaming: args.isStreaming ?? false,
@@ -329,7 +329,7 @@ var slice = createSliceWithThunks({
      * - 循环直到无工具调用或触发其他运行时停止条件
      */
     runAgent: create.asyncThunk(async (args, thunkApi) => {
-      const { runAgentClientLoop } = await import("./runAgentClientLoop-TSNSRQEP.js");
+      const { runAgentClientLoop } = await import("./runAgentClientLoop-NKCVEOOU.js");
       const { content: loopContent, toolCallCount } = await runAgentClientLoop(
         {
           agentKey: args.agentKey,
@@ -345,7 +345,7 @@ var slice = createSliceWithThunks({
      * 聊天轮次流式 Agent 调用
      */
     streamAgentChatTurn: create.asyncThunk(async (args, thunkApi) => {
-      const { streamAgentChatTurnHandler } = await import("./streamAgentChatTurn-RJLDV4WZ.js");
+      const { streamAgentChatTurnHandler } = await import("./streamAgentChatTurn-V7GZPMO4.js");
       return streamAgentChatTurnHandler(args, thunkApi);
     }),
     /**

package/{chunk-IKOKYBYJ.js → chunk-OHRQXEON.js}

@@ -2,7 +2,7 @@ import {
   deleteDialog,
   runtime_default,
   toast
-} from "./chunk-XZIW3Q5B.js";
+} from "./chunk-HSY7F4PP.js";
 import {
   getCurrentSpaceId,
   getCurrentSpaceIdRaw,

package/{chunk-6MXDOUMH.js → chunk-R4BMKAR5.js}

@@ -1,7 +1,8 @@
 import {
   mergeAvailabilityDeadline,
+  resolveCredentialCandidateKeys,
   resolveCredentialKeyWithFallback
-} from "./chunk-3MZAGMYY.js";
+} from "./chunk-JLR5NWP2.js";
 
 // packages/agent-runtime/credentialAvailability.ts
 import { homedir } from "node:os";
@@ -66,10 +67,56 @@ async function readCredentialAvailability(env = process.env, now = Date.now()) {
     Object.entries(entries).map(([key, entry]) => [key, entry.nextAvailableAt])
   );
 }
-async function readCredentialEntry(credentialKey, env = process.env, now = Date.now()) {
+async function readEffectiveCredentialEntry(credentialKey, env = process.env, now = Date.now()) {
   if (!credentialKey) return void 0;
+  const candidates = resolveCredentialCandidateKeys(credentialKey);
+  if (candidates.length === 0) return void 0;
   const entries = await readCredentialEntries(env, now);
-  return entries[credentialKey];
+  let effectiveEntry;
+  const activeCandidates = [];
+  for (const key of candidates) {
+    const entry = entries[key];
+    if (!entry || entry.nextAvailableAt <= now) continue;
+    activeCandidates.push({ key, markedAt: entry.markedAt });
+    if (!effectiveEntry) {
+      effectiveEntry = { ...entry, matchedKey: key };
+    } else {
+      const mergedDeadline = mergeAvailabilityDeadline(
+        effectiveEntry.nextAvailableAt,
+        entry.nextAvailableAt
+      );
+      const mergedProbe = effectiveEntry.lastProbeAt !== void 0 || entry.lastProbeAt !== void 0 ? Math.max(effectiveEntry.lastProbeAt ?? 0, entry.lastProbeAt ?? 0) : void 0;
+      const mergedMarkedAt = effectiveEntry.markedAt !== void 0 || entry.markedAt !== void 0 ? Math.max(effectiveEntry.markedAt ?? 0, entry.markedAt ?? 0) : void 0;
+      effectiveEntry = {
+        nextAvailableAt: mergedDeadline ?? entry.nextAvailableAt,
+        ...mergedMarkedAt !== void 0 ? { markedAt: mergedMarkedAt } : {},
+        ...mergedProbe !== void 0 ? { lastProbeAt: mergedProbe } : {},
+        matchedKey: effectiveEntry.matchedKey
+      };
+    }
+  }
+  if (effectiveEntry) {
+    effectiveEntry.candidates = activeCandidates;
+  }
+  return effectiveEntry;
+}
+function resolveEffectiveCredentialCooldown(credentialKey, credentialAvailability, now = 0) {
+  if (!credentialKey) return void 0;
+  const candidates = resolveCredentialCandidateKeys(credentialKey);
+  let effective;
+  for (const key of candidates) {
+    const at = credentialAvailability[key];
+    if (typeof at === "number" && Number.isFinite(at) && (now === 0 || at > now)) {
+      effective = mergeAvailabilityDeadline(effective, at);
+    }
+  }
+  return effective;
+}
+async function readCredentialEntry(credentialKey, env = process.env, now = Date.now()) {
+  const effective = await readEffectiveCredentialEntry(credentialKey, env, now);
+  if (!effective) return void 0;
+  const { matchedKey, candidates, ...entry } = effective;
+  return entry;
 }
 async function writeCredentialAvailability(live, env = process.env) {
   const path = resolveCredentialAvailabilityPath(env);
@@ -106,16 +153,30 @@ async function clearCredentialAvailabilityIfMarkedAt(credentialKey, expectedMark
 async function clearCredentialAvailability(credentialKey, env = process.env, now = Date.now()) {
   if (!credentialKey) return;
   const live = await readCredentialEntries(env, now);
-  if (!(credentialKey in live)) return;
-  delete live[credentialKey];
+  const candidates = resolveCredentialCandidateKeys(credentialKey);
+  let changed = false;
+  for (const key of candidates) {
+    if (key in live) {
+      delete live[key];
+      changed = true;
+    }
+  }
+  if (!changed) return;
   await writeCredentialAvailability(live, env);
 }
 async function recordCredentialProbe(credentialKey, env = process.env, now = Date.now()) {
   if (!credentialKey) return;
   const live = await readCredentialEntries(env, now);
-  const existing = live[credentialKey];
+  let targetKey = credentialKey;
+  if (!(targetKey in live)) {
+    const candidates = resolveCredentialCandidateKeys(credentialKey);
+    const found = candidates.find((k) => k in live);
+    if (!found) return;
+    targetKey = found;
+  }
+  const existing = live[targetKey];
   if (!existing) return;
-  live[credentialKey] = { ...existing, lastProbeAt: now };
+  live[targetKey] = { ...existing, lastProbeAt: now };
   await writeCredentialAvailability(live, env);
 }
 function applyCredentialAvailability(agents, credentialAvailability) {
@@ -123,7 +184,7 @@ function applyCredentialAvailability(agents, credentialAvailability) {
   return agents.map((agent) => {
     const key = resolveCredentialKeyWithFallback(agent);
     if (!key) return agent;
-    const at = credentialAvailability[key];
+    const at = resolveEffectiveCredentialCooldown(key, credentialAvailability);
     if (typeof at !== "number") return agent;
     const merged = mergeAvailabilityDeadline(
       agent.nextAvailableAt,
@@ -138,6 +199,7 @@ function applyCredentialAvailability(agents, credentialAvailability) {
 
 export {
   readCredentialAvailability,
+  readEffectiveCredentialEntry,
   readCredentialEntry,
   markCredentialUnavailable,
   clearCredentialAvailabilityIfMarkedAt,