tarsk 0.5.76 → 0.5.78

package/dist/index.js

@@ -365,6 +365,19 @@ var init_agent_modes = __esm({
   }
 });
 
+// ../shared/dist/agent-note.js
+function isTarskAgentNoteModel(model) {
+  return model === TARSK_AGENT_NOTE_MODEL;
+}
+var TARSK_AGENT_NOTE_MODEL, TARSK_AGENT_NOTE_LABEL;
+var init_agent_note = __esm({
+  "../shared/dist/agent-note.js"() {
+    "use strict";
+    TARSK_AGENT_NOTE_MODEL = "tarsk";
+    TARSK_AGENT_NOTE_LABEL = "Tarsk";
+  }
+});
+
 // ../shared/dist/agent-session.js
 var AGENT_MAIN_LANE, AGENT_SESSION_STORAGE_VERSION, AGENT_SESSION_LEGACY_STORAGE_VERSION, AGENT_ROLLOVER_DETAILS_KIND;
 var init_agent_session = __esm({
@@ -867,6 +880,110 @@ var init_observations = __esm({
   }
 });
 
+// ../shared/dist/grep-limits.js
+function clampGrepContextLines(value2) {
+  if (value2 === void 0) {
+    return void 0;
+  }
+  if (!Number.isFinite(value2)) {
+    return 0;
+  }
+  return Math.max(0, Math.min(MAX_GREP_CONTENT_CONTEXT, Math.trunc(value2)));
+}
+function grepContextWidth(before, after) {
+  return Math.max(1, before + after + 1);
+}
+function scaleGrepHeadLimitForContext(requested, contextWidth) {
+  if (contextWidth <= 1) {
+    return requested;
+  }
+  const scaled = Math.ceil(requested / contextWidth);
+  return Math.max(contextWidth, scaled);
+}
+function isContentMode(mode) {
+  return mode === void 0 || mode === "content";
+}
+function contextWasClamped(requested, clamped) {
+  if (requested === void 0 || clamped === void 0) {
+    return false;
+  }
+  return requested !== clamped;
+}
+function resolveGrepContentBudget(input2) {
+  if (!isContentMode(input2.output_mode)) {
+    return {
+      contextWidth: 1,
+      contextClamped: false,
+      headLimit: input2.head_limit,
+      headLimitScaled: false
+    };
+  }
+  const context2 = clampGrepContextLines(input2.context);
+  const contextC = clampGrepContextLines(input2["-C"]);
+  const contextBefore = clampGrepContextLines(input2["-B"]);
+  const contextAfter = clampGrepContextLines(input2["-A"]);
+  const contextClamped = contextWasClamped(input2.context, context2) || contextWasClamped(input2["-C"], contextC) || contextWasClamped(input2["-B"], contextBefore) || contextWasClamped(input2["-A"], contextAfter);
+  let before = 0;
+  let after = 0;
+  if (context2 !== void 0) {
+    before = context2;
+    after = context2;
+  } else if (contextC !== void 0) {
+    before = contextC;
+    after = contextC;
+  } else {
+    before = contextBefore ?? 0;
+    after = contextAfter ?? 0;
+  }
+  const contextWidth = grepContextWidth(before, after);
+  if (contextWidth <= 1) {
+    return {
+      context: context2,
+      contextC,
+      contextBefore,
+      contextAfter,
+      contextWidth: 1,
+      contextClamped,
+      headLimit: input2.head_limit,
+      headLimitScaled: false
+    };
+  }
+  const requested = input2.head_limit === void 0 || input2.head_limit === 0 ? DEFAULT_GREP_HEAD_LIMIT : input2.head_limit;
+  const headLimit = scaleGrepHeadLimitForContext(requested, contextWidth);
+  return {
+    context: context2,
+    contextC,
+    contextBefore,
+    contextAfter,
+    contextWidth,
+    contextClamped,
+    headLimit,
+    headLimitScaled: headLimit !== input2.head_limit
+  };
+}
+function formatGrepContextBudgetNotice(budget) {
+  const parts = [];
+  if (budget.contextClamped) {
+    parts.push(`Context limited to ${MAX_GREP_CONTENT_CONTEXT} lines per side.`);
+  }
+  if (budget.headLimitScaled && budget.headLimit) {
+    parts.push(`Output line budget scaled to ${budget.headLimit}.`);
+  }
+  if (parts.length === 0) {
+    return "";
+  }
+  return `[${parts.join(" ")}]`;
+}
+var DEFAULT_GREP_HEAD_LIMIT, DEFAULT_GREP_CONTENT_CONTEXT, MAX_GREP_CONTENT_CONTEXT;
+var init_grep_limits = __esm({
+  "../shared/dist/grep-limits.js"() {
+    "use strict";
+    DEFAULT_GREP_HEAD_LIMIT = 40;
+    DEFAULT_GREP_CONTENT_CONTEXT = 0;
+    MAX_GREP_CONTENT_CONTEXT = 2;
+  }
+});
+
 // ../shared/dist/selection.js
 function areResultSelectionsEnabled() {
   return process.env[RESULT_SELECTION_ENV_FLAG] !== "false";
@@ -937,7 +1054,7 @@ function isPromptCacheUnavailable(cacheHitRate) {
 function isMicrocompactEligibleTool(toolName2) {
   return MICROCOMPACT_ELIGIBLE_TOOL_SET.has(toolName2);
 }
-var MICROCOMPACT_KEEP_RECENT, MICROCOMPACT_KEEP_TOKENS, MICROCOMPACT_TRIGGER_MARGIN, MICROCOMPACT_MIN_SAVE_TOKENS, MICROCOMPACT_DIGEST_MIN_CHARS, MICROCOMPACT_NO_CACHE_DIGEST_MIN_CHARS, MICROCOMPACT_SHORT_STUB_MAX_CHARS, MICROCOMPACT_PROACTIVE_TURN_THRESHOLD, MICROCOMPACT_PROACTIVE_PAYLOAD_TOKENS, MICROCOMPACT_PROACTIVE_MIN_SAVE_TOKENS, MICROCOMPACT_PROACTIVE_KEEP_TOKENS, MICROCOMPACT_NO_CACHE_KEEP_TOKENS, MICROCOMPACT_OVERFLOW_KEEP_RECENT, MICROCOMPACT_OVERFLOW_KEEP_TOKENS, MICROCOMPACT_OVERFLOW_MIN_SAVE_TOKENS, MICROCOMPACT_OVERFLOW_DIGEST_MIN_CHARS, MICROCOMPACT_NO_CACHE_HIT_RATE_THRESHOLD, MICROCOMPACT_NO_CACHE_AGGRESSION_FACTOR, MICROCOMPACT_MARKER_PREFIX, SUPERSESSION_MARKER_PREFIX, MICROCOMPACT_ELIGIBLE_TOOLS, MICROCOMPACT_ELIGIBLE_TOOL_SET;
+var MICROCOMPACT_KEEP_RECENT, MICROCOMPACT_KEEP_TOKENS, MICROCOMPACT_TRIGGER_MARGIN, MICROCOMPACT_MIN_SAVE_TOKENS, MICROCOMPACT_DIGEST_MIN_CHARS, MICROCOMPACT_NO_CACHE_DIGEST_MIN_CHARS, MICROCOMPACT_SHORT_STUB_MAX_CHARS, MICROCOMPACT_PROACTIVE_TURN_THRESHOLD, MICROCOMPACT_PROACTIVE_PAYLOAD_TOKENS, MICROCOMPACT_CACHE_RECLAIM_PAYLOAD_TOKENS, MICROCOMPACT_CACHE_RECLAIM_MESSAGE_COUNT, MICROCOMPACT_PROACTIVE_MIN_SAVE_TOKENS, MICROCOMPACT_PROACTIVE_KEEP_TOKENS, MICROCOMPACT_NO_CACHE_KEEP_TOKENS, MICROCOMPACT_OVERFLOW_KEEP_RECENT, MICROCOMPACT_OVERFLOW_KEEP_TOKENS, MICROCOMPACT_OVERFLOW_MIN_SAVE_TOKENS, MICROCOMPACT_OVERFLOW_DIGEST_MIN_CHARS, MICROCOMPACT_NO_CACHE_HIT_RATE_THRESHOLD, MICROCOMPACT_NO_CACHE_AGGRESSION_FACTOR, MICROCOMPACT_MARKER_PREFIX, SUPERSESSION_MARKER_PREFIX, MICROCOMPACT_ELIGIBLE_TOOLS, MICROCOMPACT_ELIGIBLE_TOOL_SET;
 var init_microcompact = __esm({
   "../shared/dist/microcompact.js"() {
     "use strict";
@@ -950,6 +1067,8 @@ var init_microcompact = __esm({
     MICROCOMPACT_SHORT_STUB_MAX_CHARS = 2048;
     MICROCOMPACT_PROACTIVE_TURN_THRESHOLD = 15;
     MICROCOMPACT_PROACTIVE_PAYLOAD_TOKENS = 5e4;
+    MICROCOMPACT_CACHE_RECLAIM_PAYLOAD_TOKENS = 8e4;
+    MICROCOMPACT_CACHE_RECLAIM_MESSAGE_COUNT = 80;
     MICROCOMPACT_PROACTIVE_MIN_SAVE_TOKENS = 5e3;
     MICROCOMPACT_PROACTIVE_KEEP_TOKENS = 1e4;
     MICROCOMPACT_NO_CACHE_KEEP_TOKENS = 2e3;
@@ -997,6 +1116,13 @@ var init_processing_similes = __esm({
   }
 });
 
+// ../shared/dist/processing-polling.js
+var init_processing_polling = __esm({
+  "../shared/dist/processing-polling.js"() {
+    "use strict";
+  }
+});
+
 // ../shared/dist/context-rollover.js
 var CONTEXT_ROLLOVER_MARKER, CONTEXT_ROLLOVER_NOTICE, CONTEXT_ROLLOVER_MAX_HANDOFF_CHARS, CONTEXT_ROLLOVER_MAX_NOTE_CHARS, CONTEXT_ROLLOVER_MAX_TODO_CHARS, CONTEXT_ROLLOVER_MAX_RECENT_MESSAGE_CHARS, CONTEXT_ROLLOVER_MAX_REPOSITORY_STATE_CHARS, CONTEXT_ROLLOVER_MAX_CHANGE_DIGEST_CHARS, CONTEXT_ROLLOVER_MAX_HUNKS_PER_FILE, CONTEXT_HISTORY_PAGE_CHARS, CONTEXT_HISTORY_SEARCH_LIMIT, CONTEXT_HISTORY_SEARCH_EXCERPT_CHARS, CONTEXT_NOTE_NAME_MAX_CHARS, CONTEXT_NOTE_CONTENT_MAX_CHARS, CONTEXT_NOTE_PAGE_CHARS, CONTEXT_NOTE_SEARCH_EXCERPT_CHARS, CONTEXT_MEMORY_INSTRUCTIONS;
 var init_context_rollover = __esm({
@@ -1030,7 +1156,7 @@ This conversation can move to a fresh model context while its complete transcrip
 // ../shared/dist/system-prompt.js
 function buildDefaultSystemPrompt(toolNames) {
   const toolList = toolNames.length > 0 ? toolNames.join(", ") : "read, bash, edit, and write";
-  return `You are a helpful coding assistant. You have access to ${toolList} tools. Use them to explore and modify the codebase as needed. ${SHELL_WORKING_DIRECTORY_INSTRUCTION} Skills are created and stored in .agents/skills/ . Use Mermaid for flowcharts, sequence diagrams, state diagrams, or graphs when appropriate. When a tool returns a local image, audio, or video file intended for the user, present it in the conversation by returning the file path or URL plainly so the UI can render it inline. If the user asks you to do multiple tasks "in subagents" or asks for work to be split across subagents, delegate the work by calling the agent tool once per subtask when that tool is available. Break the request into clear focused prompts, run subagents in parallel when supported by the runtime, and then synthesize their results for the user. Be concise and answer directly; do not restate the question, add preamble, or end with unsolicited follow-ups. Do not use emojis.
+  return `You are a helpful coding assistant. You have access to ${toolList} tools. Use them to explore and modify the codebase as needed. ${PARALLEL_TOOL_CALLS_INSTRUCTION} ${SHELL_WORKING_DIRECTORY_INSTRUCTION} Skills are created and stored in .agents/skills/ . Use Mermaid for flowcharts, sequence diagrams, state diagrams, or graphs when appropriate. When a tool returns a local image, audio, or video file intended for the user, present it in the conversation by returning the file path or URL plainly so the UI can render it inline. If the user asks you to do multiple tasks "in subagents" or asks for work to be split across subagents, delegate the work by calling the agent tool once per subtask when that tool is available. Break the request into clear focused prompts, run subagents in parallel when supported by the runtime, and then synthesize their results for the user. Be concise and answer directly; do not restate the question, add preamble, or end with unsolicited follow-ups. Do not use emojis.
 
 ${CONTEXT_MEMORY_INSTRUCTIONS}`;
 }
@@ -1043,14 +1169,15 @@ function formatCurrentDateLine(referenceDate = /* @__PURE__ */ new Date()) {
   });
   return `The current date is ${date5}.`;
 }
-var TARSK_REPO_ROOT_ENV_VAR, SHELL_WORKING_DIRECTORY_INSTRUCTION, BASE_SYSTEM_PROMPT;
+var TARSK_REPO_ROOT_ENV_VAR, SHELL_WORKING_DIRECTORY_INSTRUCTION, PARALLEL_TOOL_CALLS_INSTRUCTION, BASE_SYSTEM_PROMPT;
 var init_system_prompt = __esm({
   "../shared/dist/system-prompt.js"() {
     "use strict";
     init_context_rollover();
     TARSK_REPO_ROOT_ENV_VAR = "TARSK_REPO_ROOT";
     SHELL_WORKING_DIRECTORY_INSTRUCTION = `Shell commands start in the repository root. Assume that working directory, prefer repository-relative paths, and do not prefix commands with an absolute-path cd. Use $${TARSK_REPO_ROOT_ENV_VAR} only as a fallback when the working directory cannot be assumed.`;
-    BASE_SYSTEM_PROMPT = `You are a helpful coding assistant. ${SHELL_WORKING_DIRECTORY_INSTRUCTION} Skills are created and stored in .agents/skills/ . Use Mermaid for flowcharts, sequence diagrams, state diagrams, or graphs when appropriate. When a tool returns a local image/audio/video file intended for the user, present it in the conversation by returning the file path or URL plainly so the UI can render it inline. Be concise and answer directly; do not restate the question, add preamble, or end with unsolicited follow-ups. Do not use emojis.
+    PARALLEL_TOOL_CALLS_INSTRUCTION = "Issue independent tool calls together in the same turn so they run in parallel.";
+    BASE_SYSTEM_PROMPT = `You are a helpful coding assistant. ${SHELL_WORKING_DIRECTORY_INSTRUCTION} ${PARALLEL_TOOL_CALLS_INSTRUCTION} Skills are created and stored in .agents/skills/ . Use Mermaid for flowcharts, sequence diagrams, state diagrams, or graphs when appropriate. When a tool returns a local image/audio/video file intended for the user, present it in the conversation by returning the file path or URL plainly so the UI can render it inline. Be concise and answer directly; do not restate the question, add preamble, or end with unsolicited follow-ups. Do not use emojis.
 
 ${CONTEXT_MEMORY_INSTRUCTIONS}`;
   }
@@ -2416,6 +2543,34 @@ var init_providers = __esm({
   }
 });
 
+// ../shared/dist/provider-settings.js
+var init_provider_settings = __esm({
+  "../shared/dist/provider-settings.js"() {
+    "use strict";
+  }
+});
+
+// ../shared/dist/general-settings.js
+var init_general_settings = __esm({
+  "../shared/dist/general-settings.js"() {
+    "use strict";
+  }
+});
+
+// ../shared/dist/plugin-settings.js
+var init_plugin_settings = __esm({
+  "../shared/dist/plugin-settings.js"() {
+    "use strict";
+  }
+});
+
+// ../shared/dist/setup-settings.js
+var init_setup_settings = __esm({
+  "../shared/dist/setup-settings.js"() {
+    "use strict";
+  }
+});
+
 // ../shared/dist/web-fetch.js
 function normalizeFetchHostname(hostname4) {
   const lower2 = hostname4.toLowerCase();
@@ -13389,6 +13544,7 @@ var init_dist = __esm({
     init_model_aliases();
     init_model_id();
     init_agent_modes();
+    init_agent_note();
     init_agent_session();
     init_auto_route();
     init_model_reasoning();
@@ -13399,10 +13555,12 @@ var init_dist = __esm({
     init_assistant_summary();
     init_conversation_title();
     init_observations();
+    init_grep_limits();
     init_selection();
     init_user_message();
     init_microcompact();
     init_processing_similes();
+    init_processing_polling();
     init_system_prompt();
     init_context_rollover();
     init_image_payload();
@@ -13418,6 +13576,10 @@ var init_dist = __esm({
     init_smart_js_plan();
     init_smart_js_results();
     init_providers();
+    init_provider_settings();
+    init_general_settings();
+    init_plugin_settings();
+    init_setup_settings();
     init_web_fetch();
     init_permission_messages();
     init_explorer_media();
@@ -57542,6 +57704,13 @@ function isProactiveMicrocompactTrigger(messages, options2) {
   const tokensBefore = sumMessageTokens(messages) + config3.fixedOverheadTokens;
   return countAssistantTurns(messages) >= config3.proactiveTurnThreshold || tokensBefore >= config3.proactivePayloadTokens;
 }
+function isCacheReclaimTrigger(messages, config3, cacheHitRate) {
+  if (isPromptCacheUnavailable(cacheHitRate) || cacheHitRate === void 0 || cacheHitRate <= 0) {
+    return false;
+  }
+  const tokensBefore = sumMessageTokens(messages) + config3.fixedOverheadTokens;
+  return tokensBefore >= config3.cacheReclaimPayloadTokens || messages.length >= config3.cacheReclaimMessageCount;
+}
 function isNearWindowCeilingTrigger(messages, options2, config3, cacheHitRate) {
   if (options2.overflowRecovery === true) {
     return true;
@@ -57566,6 +57735,37 @@ function unprotectInTurnFrozenIds(messages, frozenToolCallIds, unprotectInTurn)
   }
   return stillFrozen;
 }
+function unprotectOldestFrozenIds(messages, frozenToolCallIds, keepRecent, keepTokens) {
+  if (!frozenToolCallIds || frozenToolCallIds.size === 0) {
+    return frozenToolCallIds;
+  }
+  const frozenIndexes = [];
+  for (let index4 = 0; index4 < messages.length; index4++) {
+    const message = messages[index4];
+    if (isToolResultMessage3(message) && frozenToolCallIds.has(message.toolCallId)) {
+      frozenIndexes.push(index4);
+    }
+  }
+  if (frozenIndexes.length === 0) {
+    return frozenToolCallIds;
+  }
+  const stillFrozen = /* @__PURE__ */ new Set();
+  let keptTokens = 0;
+  let keptRecent = 0;
+  for (let cursor = frozenIndexes.length - 1; cursor >= 0; cursor--) {
+    const message = messages[frozenIndexes[cursor]];
+    if (!isToolResultMessage3(message)) {
+      continue;
+    }
+    if (keptRecent >= keepRecent && keptTokens >= keepTokens) {
+      break;
+    }
+    stillFrozen.add(message.toolCallId);
+    keptRecent += 1;
+    keptTokens += estimateMessageTokens(message);
+  }
+  return stillFrozen;
+}
 function isCompactedToolResultText(text) {
   return text.startsWith(MICROCOMPACT_MARKER_PREFIX) || text.startsWith(TODO_DUPLICATE_OMITTED_PREFIX) || isSupersessionMarker(text);
 }
@@ -57783,6 +57983,14 @@ function resolveMicrocompactConfig(options2) {
       MICROCOMPACT_PROACTIVE_MIN_SAVE_TOKENS
     ),
     proactiveKeepTokens: overflowRecovery ? MICROCOMPACT_OVERFLOW_KEEP_TOKENS : resolveNumericOption(options2.proactiveKeepTokens, MICROCOMPACT_PROACTIVE_KEEP_TOKENS),
+    cacheReclaimPayloadTokens: resolveNumericOption(
+      options2.cacheReclaimPayloadTokens,
+      MICROCOMPACT_CACHE_RECLAIM_PAYLOAD_TOKENS
+    ),
+    cacheReclaimMessageCount: resolveNumericOption(
+      options2.cacheReclaimMessageCount,
+      MICROCOMPACT_CACHE_RECLAIM_MESSAGE_COUNT
+    ),
     // Callers guard against an absent context window before resolving config, so
     // the fallback value is never actually used to make a decision.
     effectiveWindow: computeEffectiveContextWindow(
@@ -57883,13 +58091,20 @@ function computeMicrocompactTriggerState(messages, options2, config3) {
     cacheHitRate
   );
   const proactiveTrigger = isProactiveMicrocompactTrigger(messages, options2);
-  const frozenToolCallIds = overflowRecovery || noCache ? void 0 : unprotectInTurnFrozenIds(messages, options2.frozenToolCallIds, nearWindowCeiling);
+  const cacheReclaim = isCacheReclaimTrigger(messages, config3, cacheHitRate);
+  const frozenToolCallIds = overflowRecovery || noCache ? void 0 : cacheReclaim ? unprotectOldestFrozenIds(
+    messages,
+    options2.frozenToolCallIds,
+    config3.keepRecent,
+    config3.proactiveKeepTokens
+  ) : unprotectInTurnFrozenIds(messages, options2.frozenToolCallIds, nearWindowCeiling);
   const { messageCount: cacheProtectedMessageCount, tokens: cacheProtectedTokens } = countCacheProtected(messages, frozenToolCallIds);
   if (cacheProtectedMessageCount > 0) {
     log4.debug("Preserving cache-protected prompt prefix", {
       cacheProtectedMessageCount,
       cacheProtectedTokens,
-      tokensBefore
+      tokensBefore,
+      cacheReclaim
     });
   }
   return {
@@ -57899,23 +58114,24 @@ function computeMicrocompactTriggerState(messages, options2, config3) {
     frozenToolCallIds,
     nearWindowCeiling,
     proactiveTrigger,
+    cacheReclaim,
     cacheProtectedMessageCount,
     cacheProtectedTokens
   };
 }
-function resolveEffectiveMinSaveTokens(config3, noCache, proactiveTrigger, nearWindowCeiling) {
+function resolveEffectiveMinSaveTokens(config3, noCache, proactiveTrigger, nearWindowCeiling, cacheReclaim) {
   if (noCache) {
     return Math.min(
       Math.floor(config3.minSaveTokens * MICROCOMPACT_NO_CACHE_AGGRESSION_FACTOR),
       config3.proactiveMinSaveTokens
     );
   }
-  if (proactiveTrigger && !nearWindowCeiling) {
+  if ((proactiveTrigger || cacheReclaim) && !nearWindowCeiling) {
     return config3.proactiveMinSaveTokens;
   }
   return config3.minSaveTokens;
 }
-function resolveEffectiveKeepTokens(config3, noCache, proactiveTrigger, nearWindowCeiling) {
+function resolveEffectiveKeepTokens(config3, noCache, proactiveTrigger, nearWindowCeiling, cacheReclaim) {
   if (noCache) {
     return Math.min(
       config3.keepTokens,
@@ -57923,7 +58139,7 @@ function resolveEffectiveKeepTokens(config3, noCache, proactiveTrigger, nearWind
       MICROCOMPACT_NO_CACHE_KEEP_TOKENS
     );
   }
-  if (proactiveTrigger && !nearWindowCeiling) {
+  if ((proactiveTrigger || cacheReclaim) && !nearWindowCeiling) {
     return Math.min(config3.keepTokens, config3.proactiveKeepTokens);
   }
   return config3.keepTokens;
@@ -57936,13 +58152,15 @@ function resolveMicrocompactThresholds(config3, trigger) {
     config3,
     trigger.noCache,
     trigger.proactiveTrigger,
-    trigger.nearWindowCeiling
+    trigger.nearWindowCeiling,
+    trigger.cacheReclaim
   );
   const effectiveKeepTokens = resolveEffectiveKeepTokens(
     config3,
     trigger.noCache,
     trigger.proactiveTrigger,
-    trigger.nearWindowCeiling
+    trigger.nearWindowCeiling,
+    trigger.cacheReclaim
   );
   const effectiveDigestMinChars = resolveEffectiveDigestMinChars(config3, trigger.noCache);
   if (trigger.noCache) {
@@ -58037,8 +58255,8 @@ function shouldSkipPrefixRewriteForCacheEconomics(trigger, options2, messages, c
   const projected = projectClearedMessages(messages, clearCandidates);
   return !isMicrocompactRewriteCheaperThanKeep(previousWire, messages, projected);
 }
-function isUnprotectedInTurnCandidate(trigger, options2, messages, index4) {
-  if (!trigger.nearWindowCeiling) {
+function isUnprotectedFrozenCandidate(trigger, options2, messages, index4) {
+  if (!trigger.nearWindowCeiling && !trigger.cacheReclaim) {
     return false;
   }
   const message = messages[index4];
@@ -58056,7 +58274,7 @@ function selectCacheEconomicClearCandidates(trigger, options2, messages, clearCa
   }
   const prefixLength = options2.previousWire?.length ?? 0;
   return clearCandidates.filter(function isAllowedRewrite(index4) {
-    return index4 >= prefixLength || isUnprotectedInTurnCandidate(trigger, options2, messages, index4);
+    return index4 >= prefixLength || isUnprotectedFrozenCandidate(trigger, options2, messages, index4);
   });
 }
 async function applyMicrocompactClearance(params) {
@@ -58087,7 +58305,7 @@ async function microcompactMessages(messages, options2 = {}) {
   }
   const config3 = resolveMicrocompactConfig(options2);
   const trigger = computeMicrocompactTriggerState(messages, options2, config3);
-  if (!trigger.nearWindowCeiling && !trigger.proactiveTrigger) {
+  if (!trigger.nearWindowCeiling && !trigger.proactiveTrigger && !trigger.cacheReclaim) {
     return unchangedMicrocompactResult(messages, emptyStats2, trigger.tokensBefore);
   }
   const { effectiveMinSaveTokens, effectiveKeepTokens, effectiveDigestMinChars } = resolveMicrocompactThresholds(config3, trigger);
@@ -58790,7 +59008,12 @@ async function reconcileInterruptedSessionTurns(db, sessionId, sessionEntryCurso
   if (earliestOpenStart === null) {
     return 0;
   }
-  const entries = await loadSessionEntriesFrom(db, sessionId, earliestOpenStart, sessionEntryCursor);
+  const entries = await loadSessionEntriesFrom(
+    db,
+    sessionId,
+    earliestOpenStart,
+    sessionEntryCursor
+  );
   let reconciledCount = 0;
   for (let index4 = 0; index4 < turns.length; index4 += 1) {
     const reconciled = await reconcileOpenTurn(
@@ -59183,6 +59406,10 @@ async function clearConversationHistory(db, threadId, conversationId) {
         {
           sql: "DELETE FROM conversation_reads WHERE threadId = ? AND conversationId = ?",
           args: [threadId, conversationId]
+        },
+        {
+          sql: "DELETE FROM conversation_completions WHERE threadId = ? AND conversationId = ?",
+          args: [threadId, conversationId]
         }
       ],
       "write"
@@ -59535,7 +59762,13 @@ async function getRecentConversations(db, limit3, offset = 0, projectId, exclude
             AND last_turn.status = 'active'
           ORDER BY last_turn.timestamp DESC
           LIMIT 1
-        ) as model
+        ) as model,
+        EXISTS (
+          SELECT 1
+          FROM conversation_completions completions
+          WHERE completions.threadId = recent.threadId
+            AND completions.conversationId = recent.conversationId
+        ) as isComplete
       FROM recent_conversations recent
       INNER JOIN (
         SELECT threadId, conversationId, input_tokens, output_tokens
@@ -59573,6 +59806,23 @@ async function markConversationRead(db, threadId, conversationId) {
     throw error2;
   }
 }
+async function markConversationComplete(db, threadId, conversationId) {
+  await db.execute(
+    `
+      INSERT INTO conversation_completions (threadId, conversationId, completedAt)
+      VALUES (?, ?, ?)
+      ON CONFLICT (threadId, conversationId)
+      DO UPDATE SET completedAt = excluded.completedAt
+    `,
+    [threadId, conversationId, (/* @__PURE__ */ new Date()).toISOString()]
+  );
+}
+async function unmarkConversationComplete(db, threadId, conversationId) {
+  await db.execute(
+    "DELETE FROM conversation_completions WHERE threadId = ? AND conversationId = ?",
+    [threadId, conversationId]
+  );
+}
 async function unmarkConversationRead(db, threadId, conversationId) {
   try {
     await db.execute("DELETE FROM conversation_reads WHERE threadId = ? AND conversationId = ?", [
@@ -59669,6 +59919,7 @@ async function purgeAllConversationHistory(db) {
       [
         "DELETE FROM agent_sessions",
         "DELETE FROM conversation_reads",
+        "DELETE FROM conversation_completions",
         "DELETE FROM conversation_history"
       ],
       "write"
@@ -59690,6 +59941,10 @@ async function purgeConversationHistoryForThread(db, threadId) {
           sql: "DELETE FROM conversation_reads WHERE threadId = ?",
           args: [threadId]
         },
+        {
+          sql: "DELETE FROM conversation_completions WHERE threadId = ?",
+          args: [threadId]
+        },
         {
           sql: "DELETE FROM conversation_history WHERE threadId = ?",
           args: [threadId]
@@ -59724,6 +59979,15 @@ async function purgeConversationHistoryForProject(db, projectId) {
           `,
           args: [projectId]
         },
+        {
+          sql: `
+            DELETE FROM conversation_completions
+            WHERE threadId IN (
+              SELECT threads.id FROM threads WHERE threads.projectId = ?
+            )
+          `,
+          args: [projectId]
+        },
         {
           sql: `
             DELETE FROM conversation_history
@@ -101161,7 +101425,7 @@ var require_gaxios = __commonJS({
     var retry_js_1 = require_retry3();
     var stream_1 = __require("stream");
     var interceptor_js_1 = require_interceptor();
-    var randomUUID27 = async () => globalThis.crypto?.randomUUID() || (await import("crypto")).randomUUID();
+    var randomUUID28 = async () => globalThis.crypto?.randomUUID() || (await import("crypto")).randomUUID();
     var HTTP_STATUS_NO_CONTENT = 204;
     var Gaxios = class {
       agentCache = /* @__PURE__ */ new Map();
@@ -101434,7 +101698,7 @@ var require_gaxios = __commonJS({
          */
         ["Blob", "File", "FormData"].includes(opts.data?.constructor?.name || "");
         if (opts.multipart?.length) {
-          const boundary = await randomUUID27();
+          const boundary = await randomUUID28();
           preparedHeaders.set("content-type", `multipart/related; boundary=${boundary}`);
           opts.body = stream_1.Readable.from(this.getMultipartRequest(opts.multipart, boundary));
         } else if (shouldDirectlyPassData) {
@@ -148366,6 +148630,24 @@ async function migrateConversationReads(db) {
     )
   `);
 }
+async function migrateConversationCompletions(db) {
+  const exists = await db.execute(
+    `SELECT name FROM sqlite_master WHERE type='table' AND name='conversation_completions'`
+  );
+  if (exists.rows.length > 0) {
+    return;
+  }
+  tarskDebugLog("[db] Running migration: Creating conversation_completions table");
+  await db.execute(`
+    CREATE TABLE conversation_completions (
+      threadId TEXT NOT NULL,
+      conversationId TEXT NOT NULL,
+      completedAt TEXT NOT NULL,
+      PRIMARY KEY (threadId, conversationId),
+      FOREIGN KEY (threadId) REFERENCES threads(id) ON DELETE CASCADE
+    )
+  `);
+}
 async function migrateCrossProjectLaunches(db) {
   const exists = await db.execute(
     `SELECT name FROM sqlite_master WHERE type='table' AND name='cross_project_launches'`
@@ -148467,6 +148749,7 @@ async function runMigrations(db) {
     await migrateConversationHistorySummary(db);
     await migrateConversationProcessingStarts(db);
     await migrateConversationReads(db);
+    await migrateConversationCompletions(db);
     await migrateCrossProjectLaunches(db);
     await migrateCrossProjectRoutes(db);
     await migrateThreadsChatTitles(db);
@@ -148608,6 +148891,17 @@ var init_database = __esm({
         PRIMARY KEY (threadId, conversationId),
         FOREIGN KEY (threadId) REFERENCES threads(id) ON DELETE CASCADE
       )
+    `,
+      // Conversations completed after their pull request merged. A subsequent
+      // user message clears the marker and makes the conversation active again.
+      `
+      CREATE TABLE IF NOT EXISTS conversation_completions (
+        threadId TEXT NOT NULL,
+        conversationId TEXT NOT NULL,
+        completedAt TEXT NOT NULL,
+        PRIMARY KEY (threadId, conversationId),
+        FOREIGN KEY (threadId) REFERENCES threads(id) ON DELETE CASCADE
+      )
     `,
       `
       CREATE TABLE IF NOT EXISTS cross_project_launches (
@@ -172245,6 +172539,9 @@ var init_conversation_prompt_snapshot = __esm({
 
 // src/agent/prompt-cache-fingerprint.ts
 import { createHash as createHash4 } from "node:crypto";
+function promptCacheLaneSessionId(sessionId, lane = "agent") {
+  return lane === "compact" ? `${sessionId}:compact` : sessionId;
+}
 function readNumber(value2) {
   return typeof value2 === "number" && Number.isFinite(value2) && value2 > 0 ? value2 : 0;
 }
@@ -172316,6 +172613,33 @@ function hash(value2) {
 function hashCanonical(value2) {
   return hashSerialized(serializeCanonical(value2));
 }
+function touchTrackedMap(map3, key2, value2) {
+  map3.delete(key2);
+  map3.set(key2, value2);
+  if (map3.size <= MAX_TRACKED_SESSIONS2) {
+    return;
+  }
+  const oldest = map3.keys().next().value;
+  if (oldest !== void 0) {
+    map3.delete(oldest);
+  }
+}
+function rollingCacheHitRateFromTotals(totals) {
+  return calculatePromptCacheHitRate(
+    totals.cacheReadTokens,
+    billablePromptTokensFromCounts(
+      totals.inputTokens,
+      totals.cacheReadTokens,
+      totals.cacheWriteTokens
+    )
+  );
+}
+function shouldWarnPromptCacheMiss(totals, implicitPromptCache) {
+  if (implicitPromptCache || totals.calls < ZERO_CACHE_MIN_CALLS) {
+    return false;
+  }
+  return rollingCacheHitRateFromTotals(totals) < ZERO_CACHE_HIT_RATE_THRESHOLD;
+}
 function extractPayloadSections(payload) {
   if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
     return { system: void 0, tools: void 0, messages: payload };
@@ -172436,9 +172760,10 @@ function applyStablePromptCacheKey(payload, model, provider, sessionId, baseUrl)
     prompt_cache_key: createStablePromptCacheKey(model, payload, provider)
   };
 }
-function applyPromptCacheToProviderPayload(payload, modelId, provider, sessionId, baseUrl) {
-  const next = applyStablePromptCacheKey(payload, modelId, provider, sessionId, baseUrl);
-  recordPromptCacheFingerprint(sessionId, provider, modelId, next, baseUrl);
+function applyPromptCacheToProviderPayload(payload, modelId, provider, sessionId, baseUrl, lane = "agent") {
+  const cacheSessionId = promptCacheLaneSessionId(sessionId, lane);
+  const next = applyStablePromptCacheKey(payload, modelId, provider, cacheSessionId, baseUrl);
+  recordPromptCacheFingerprint(cacheSessionId, provider, modelId, next, baseUrl);
   return next;
 }
 function promptCacheTurnMetrics(usage2, firstTurn) {
@@ -172503,9 +172828,10 @@ function recordPromptCacheUsage(sessionId, event) {
   totals.inputTokens += usage2.inputTokens;
   totals.cacheReadTokens += usage2.cacheReadTokens;
   totals.cacheWriteTokens += usage2.cacheWriteTokens;
-  usageBySession.set(sessionId, totals);
+  touchTrackedMap(usageBySession, sessionId, totals);
   const last2 = lastFingerprintBySession.get(sessionId);
   const metrics = promptCacheTurnMetrics(usage2, last2?.firstTurn === true);
+  const rollingHitRate = rollingCacheHitRateFromTotals(totals);
   if (last2?.firstTurn) {
     lastFingerprintBySession.set(sessionId, { ...last2, firstTurn: false });
   }
@@ -172514,6 +172840,7 @@ function recordPromptCacheUsage(sessionId, event) {
     sessionId,
     ...usage2,
     ...metrics,
+    rollingHitRate,
     promptCacheKey: last2?.promptCacheKey,
     sessionAffinityId: last2?.sessionAffinityId,
     implicitPromptCache: last2?.implicitPromptCache,
@@ -172524,12 +172851,12 @@ function recordPromptCacheUsage(sessionId, event) {
     payloadBytes: last2?.fingerprint.payloadBytes,
     messageCount: last2?.fingerprint.messageHashes.length
   });
-  if (!warnedNoCacheSessions.has(sessionId) && !last2?.implicitPromptCache && totals.calls >= ZERO_CACHE_MIN_CALLS && metrics.cacheHitRate < ZERO_CACHE_HIT_RATE_THRESHOLD) {
+  if (!warnedNoCacheSessions.has(sessionId) && shouldWarnPromptCacheMiss(totals, last2?.implicitPromptCache === true)) {
     warnedNoCacheSessions.add(sessionId);
     log35.warn("Prompt cache is not being hit for this session", {
       sessionId,
       calls: totals.calls,
-      cacheHitRate: metrics.cacheHitRate,
+      cacheHitRate: rollingHitRate,
       cacheReadTokens: totals.cacheReadTokens,
       cacheWriteTokens: totals.cacheWriteTokens,
       inputTokens: totals.inputTokens,
@@ -172544,12 +172871,7 @@ function getSessionCacheHitRate(sessionId) {
   if (!totals || totals.calls < ZERO_CACHE_MIN_CALLS) {
     return void 0;
   }
-  const billable = billablePromptTokensFromCounts(
-    totals.inputTokens,
-    totals.cacheReadTokens,
-    totals.cacheWriteTokens
-  );
-  const cacheHitRate = calculatePromptCacheHitRate(totals.cacheReadTokens, billable);
+  const cacheHitRate = rollingCacheHitRateFromTotals(totals);
   if (last2?.implicitPromptCache && cacheHitRate < ZERO_CACHE_HIT_RATE_THRESHOLD) {
     return void 0;
   }
@@ -172566,7 +172888,7 @@ function logPromptCacheDiagnostics(sessionId) {
     totals.cacheReadTokens,
     totals.cacheWriteTokens
   );
-  const cacheHitRate = calculatePromptCacheHitRate(totals.cacheReadTokens, billablePromptTokens2);
+  const cacheHitRate = rollingCacheHitRateFromTotals(totals);
   const caching = !last2?.implicitPromptCache && totals.calls >= ZERO_CACHE_MIN_CALLS && cacheHitRate < ZERO_CACHE_HIT_RATE_THRESHOLD ? "unavailable" : totals.cacheReadTokens > 0 ? "available" : "unknown";
   const diagnostics = {
     sessionId,
@@ -172592,7 +172914,6 @@ function logPromptCacheDiagnostics(sessionId) {
     });
   }
   log35.info("Prompt cache session diagnostics", diagnostics);
-  clearPromptCacheSessionState(sessionId);
   return diagnostics;
 }
 function clearPromptCacheSessionState(sessionId) {
@@ -172611,17 +172932,10 @@ function recordPromptCacheFingerprint(sessionId, provider, model, payload, baseU
   const fingerprint = createPromptCacheFingerprint(payload, previous);
   const promptCacheKey = extractPromptCacheKey(payload);
   const firstTurn = previous === void 0;
-  previousBySession.delete(key2);
-  previousBySession.set(key2, fingerprint);
-  if (previousBySession.size > MAX_TRACKED_SESSIONS2) {
-    const oldest = previousBySession.keys().next().value;
-    if (oldest !== void 0) {
-      previousBySession.delete(oldest);
-    }
-  }
+  touchTrackedMap(previousBySession, key2, fingerprint);
   const sessionAffinityId = extractOpenRouterSessionId(payload);
   const implicitPromptCache = openRouterUsesImplicitPromptCache(model, baseUrl);
-  lastFingerprintBySession.set(sessionId, {
+  touchTrackedMap(lastFingerprintBySession, sessionId, {
     fingerprint,
     promptCacheKey,
     sessionAffinityId,
@@ -173106,6 +173420,7 @@ async function executeSubagent(options2) {
     if (signal) signal.removeEventListener("abort", onAbort);
     unsubscribe();
     logPromptCacheDiagnostics(sessionId);
+    clearPromptCacheSessionState(sessionId);
     await harness.close(SESSION_CONTEXT).catch((error2) => {
       log36.warn("Subagent cleanup failed", { error: error2 });
     });
@@ -177128,8 +177443,15 @@ function findFilesByBasenameInCwd(fileBasename, cwd, limit3) {
   try {
     const found = ts(`**/${fileBasename}`, {
       cwd,
-      dot: false,
-      ignore: ["**/node_modules/**", "**/.git/**"],
+      dot: true,
+      ignore: [
+        "**/node_modules/**",
+        "**/.git/**",
+        "**/.hg/**",
+        "**/.svn/**",
+        "**/.jj/**",
+        "**/.sl/**"
+      ],
       nodir: true
     });
     return found.slice(0, limit3).map((match2) => match2.replace(/\\/g, "/"));
@@ -177137,6 +177459,39 @@ function findFilesByBasenameInCwd(fileBasename, cwd, limit3) {
     return [];
   }
 }
+function findHiddenDotSegmentPath(resolvedPath2, cwd) {
+  const relativePath = relative4(cwd, resolvedPath2).replace(/\\/g, "/");
+  if (!relativePath || relativePath.startsWith("..") || isAbsolute4(relativePath)) {
+    return void 0;
+  }
+  const segments = relativePath.split("/").filter(Boolean);
+  const rebuilt = [];
+  let current = cwd;
+  for (let index4 = 0; index4 < segments.length; index4++) {
+    const segment = segments[index4];
+    const next = resolvePath3(current, segment);
+    if (fileExists(next)) {
+      rebuilt.push(segment);
+      current = next;
+      continue;
+    }
+    if (segment.startsWith(".")) {
+      return void 0;
+    }
+    const dotted = `.${segment}`;
+    if (TOP_LEVEL_LAYOUT_SKIP.has(dotted)) {
+      return void 0;
+    }
+    const remainder = segments.slice(index4 + 1);
+    const candidateRel = [...rebuilt, dotted, ...remainder].join("/");
+    const candidateAbs = resolvePath3(cwd, candidateRel);
+    if (fileExists(candidateAbs)) {
+      return candidateRel;
+    }
+    return void 0;
+  }
+  return void 0;
+}
 function segmentEditDistance(a2, b2) {
   if (a2 === b2) return 0;
   const al = a2.length;
@@ -177205,6 +177560,10 @@ function collectFileNotFoundHints(resolvedPath2, cwd) {
   if (suffixMatch && suffixMatch !== requestedRelative && suffixMatch !== ".") {
     return [`Try: ${suffixMatch}`];
   }
+  const hiddenDotMatch = findHiddenDotSegmentPath(resolvedPath2, cwd);
+  if (hiddenDotMatch && hiddenDotMatch !== requestedRelative) {
+    return [`Try: ${hiddenDotMatch}`];
+  }
   const siblingTypos = findSiblingNameTypos(resolvedPath2, cwd).filter(
     (match2) => match2 !== requestedRelative
   );
@@ -178900,7 +179259,7 @@ var init_tool_helpers = __esm({
 
 // src/tools/try-path-from-error.ts
 function extractTryPathFromError(error2) {
-  const pattern = /\bTry:\s*([A-Za-z0-9_./@+-]+\.[A-Za-z0-9]+|[A-Za-z0-9_./@+-]+\/[A-Za-z0-9_./@+-]+|[A-Za-z0-9_][A-Za-z0-9_./@+-]*)/g;
+  const pattern = /\bTry:\s*(\.?[A-Za-z0-9_./@+-]+\.[A-Za-z0-9]+|\.?[A-Za-z0-9_./@+-]+\/[A-Za-z0-9_./@+-]+|\.?[A-Za-z0-9_][A-Za-z0-9_./@+-]*)/g;
   let match2;
   let lastValid = null;
   while ((match2 = pattern.exec(error2)) !== null) {
@@ -181663,20 +182022,34 @@ var init_grep = __esm({
 // src/tools/rip-grep.ts
 import { statSync as statSync8 } from "node:fs";
 import path9 from "node:path";
+function grepContentBudgetFor(input2) {
+  return resolveGrepContentBudget({
+    output_mode: input2.output_mode,
+    head_limit: input2.head_limit,
+    context: input2.context,
+    "-C": input2["-C"],
+    "-A": input2["-A"],
+    "-B": input2["-B"]
+  });
+}
 function resolveMaxOutputLines(input2, smartJsCapture) {
-  if (input2.head_limit === 0) {
+  if (input2.head_limit === void 0 && smartJsCapture) {
     return void 0;
   }
-  if (input2.head_limit === void 0 && smartJsCapture) {
+  const budget = grepContentBudgetFor(input2);
+  if (budget.headLimit === 0) {
+    return void 0;
+  }
+  if (input2.head_limit === 0 && !budget.headLimitScaled) {
     return void 0;
   }
-  return (input2.head_limit ?? DEFAULT_HEAD_LIMIT) + (input2.offset ?? 0) + 1;
+  return (budget.headLimit ?? DEFAULT_GREP_HEAD_LIMIT) + (input2.offset ?? 0) + 1;
 }
 function applyHeadLimit(items, limit3, offset = 0) {
   if (limit3 === 0) {
     return { items: items.slice(offset), appliedLimit: void 0 };
   }
-  const effectiveLimit = limit3 ?? DEFAULT_HEAD_LIMIT;
+  const effectiveLimit = limit3 ?? DEFAULT_GREP_HEAD_LIMIT;
   const sliced = items.slice(offset, offset + effectiveLimit);
   const wasTruncated = items.length - offset > effectiveLimit;
   return {
@@ -181756,14 +182129,11 @@ function buildRipgrepArgs(input2, fixedStrings = false, smartJsCapture = false)
     glob: glob2,
     type,
     output_mode = "content",
-    "-B": contextBefore,
-    "-A": contextAfter,
-    "-C": contextC,
-    context: context2,
     "-n": showLineNumbers = true,
     "-i": caseInsensitive = false,
     multiline = false
   } = input2;
+  const budget = grepContentBudgetFor(input2);
   const args2 = ["--hidden", "--color=never"];
   if (fixedStrings) {
     args2.push("--fixed-strings");
@@ -181782,7 +182152,13 @@ function buildRipgrepArgs(input2, fixedStrings = false, smartJsCapture = false)
   if (smartJsCapture && output_mode === "count") args2.push("--with-filename");
   if (output_mode === "content") {
     if (hasExplicitGrepContext(input2)) {
-      appendContextArgs(args2, context2, contextC, contextBefore, contextAfter);
+      appendContextArgs(
+        args2,
+        budget.context,
+        budget.contextC,
+        budget.contextBefore,
+        budget.contextAfter
+      );
     } else if (DEFAULT_GREP_CONTENT_CONTEXT > 0) {
       appendContextArgs(args2, void 0, DEFAULT_GREP_CONTENT_CONTEXT, void 0, void 0);
     }
@@ -181939,10 +182315,11 @@ function emptyMatchText(input2) {
   }
   return "No matches found";
 }
-function formatContentResult(cwd, results, headLimit, offset, emptyText) {
+function formatContentResult(cwd, results, headLimit, offset, emptyText, budget) {
   const { items: limitedResults, appliedLimit } = applyHeadLimit(results, headLimit, offset);
   const finalLines = limitedResults.map((line) => relativizeContentLine(cwd, line));
   const limitInfo = formatLimitInfo(appliedLimit, offset > 0 ? offset : void 0);
+  const budgetNotice = budget ? formatGrepContextBudgetNotice(budget) : "";
   let text;
   if (finalLines.length === 0) {
     text = emptyText;
@@ -181952,6 +182329,11 @@ function formatContentResult(cwd, results, headLimit, offset, emptyText) {
     logCompressOutput("grep.content", flat, compressed.text);
     text = compressed.applied ? `${GREP_CONTENT_BANNER}
 ${compressed.text}` : compressed.text;
+    if (budgetNotice) {
+      text += `
+
+${budgetNotice}`;
+    }
     if (limitInfo) {
       text += `
 
@@ -182057,9 +182439,9 @@ function createRipGrepTool(cwd, options2) {
     }
   };
 }
-function formatOutputByMode(cwd, results, outputMode, headLimit, offset, emptyText) {
+function formatOutputByMode(cwd, results, outputMode, headLimit, offset, emptyText, budget) {
   if (outputMode === "content") {
-    return formatContentResult(cwd, results, headLimit, offset, emptyText);
+    return formatContentResult(cwd, results, headLimit, offset, emptyText, budget);
   }
   if (outputMode === "count") {
     return formatCountResult(cwd, results, headLimit, offset, emptyText);
@@ -182159,11 +182541,19 @@ function selectRawRipgrepCaptureSource(mode, input2, ordered) {
   return mode === "content" && !hasExplicitGrepContext(input2) ? ordered.filter(isGrepContentMatchLine) : ordered;
 }
 function resolveRawRipgrepDisplayLimit(input2) {
-  return input2.head_limit === 0 ? 0 : input2.head_limit ?? DEFAULT_HEAD_LIMIT;
+  const budget = grepContentBudgetFor(input2);
+  if (budget.headLimit === 0) {
+    return 0;
+  }
+  return budget.headLimit ?? DEFAULT_GREP_HEAD_LIMIT;
 }
 function buildRawRipgrepText(params) {
   const { searchedAsLiteral, skippedPaths, displayItems, emptyText, diagnostics } = params;
   let text = `${buildPrefixNotices(searchedAsLiteral, skippedPaths)}${displayItems.join("\n") || emptyText}${diagnostics}`;
+  const budgetNotice = params.budget ? formatGrepContextBudgetNotice(params.budget) : "";
+  if (budgetNotice) text += `
+
+${budgetNotice}`;
   const limitInfo = formatLimitInfo(params.appliedLimit, params.offset ? params.offset : void 0);
   if (limitInfo) text += `
 
@@ -182205,7 +182595,8 @@ ${capture.diagnostics.join("\n")}` : "";
     emptyText,
     diagnostics,
     appliedLimit,
-    offset: input2.offset
+    offset: input2.offset,
+    budget: grepContentBudgetFor(input2)
   });
   const details = buildRawRipgrepDetails({
     mode,
@@ -182236,7 +182627,8 @@ async function executeRipgrepSearch(cwd, input2, smartJsCapture = false, signal)
     return executeRawRipgrepSearch(cwd, effectiveInput, absolutePaths, skippedPaths, runOptions);
   }
   const outputMode = effectiveInput.output_mode ?? "content";
-  const headLimit = effectiveInput.head_limit;
+  const budget = grepContentBudgetFor(effectiveInput);
+  const headLimit = budget.headLimit;
   const offset = effectiveInput.offset ?? 0;
   const { results, searchedAsLiteral } = await runRipgrepMultiWithLiteralFallback(
     { ...effectiveInput, output_mode: outputMode },
@@ -182250,7 +182642,8 @@ async function executeRipgrepSearch(cwd, input2, smartJsCapture = false, signal)
     outputMode,
     headLimit,
     offset,
-    emptyMatchText(effectiveInput)
+    emptyMatchText(effectiveInput),
+    budget
   );
   const truncation = truncateHead2(formatted.text);
   const trailing = buildTrailingNotice(truncation);
@@ -182281,7 +182674,7 @@ async function executeRipgrepSearch(cwd, input2, smartJsCapture = false, signal)
     details: Object.keys(details).length > 0 ? details : void 0
   };
 }
-var VCS_DIRECTORIES_TO_EXCLUDE, DEFAULT_HEAD_LIMIT, DEFAULT_GREP_CONTENT_CONTEXT, GREP_TOOL_DESCRIPTION, ripGrepSchema, log40, PATHLESS_CONTENT_LINE2, REGEX_PARSE_ERROR_RE, REGEX_PARSE_HINT, LITERAL_FALLBACK_NOTICE;
+var VCS_DIRECTORIES_TO_EXCLUDE, GREP_TOOL_DESCRIPTION, ripGrepSchema, log40, PATHLESS_CONTENT_LINE2, REGEX_PARSE_ERROR_RE, REGEX_PARSE_HINT, LITERAL_FALLBACK_NOTICE;
 var init_rip_grep = __esm({
   "src/tools/rip-grep.ts"() {
     "use strict";
@@ -182304,8 +182697,6 @@ var init_rip_grep = __esm({
       "node_modules",
       ".bun"
     ];
-    DEFAULT_HEAD_LIMIT = 40;
-    DEFAULT_GREP_CONTENT_CONTEXT = 0;
     GREP_TOOL_DESCRIPTION = "Search file contents with regex (ripgrep-compatible grepts). Use read directly when the exact file path is already known. Content mode defaults to match lines only (-C 0); pass -C 3 (or -A/-B/context) when you need nearby lines for a unique edit hunk. Batch independent searches in one turn. output_mode: content (default; -A/-B/-C/context/-n apply here, -n defaults true), files_with_matches, count. Scope with path; glob for name/extension (*.ts, **/*.tsx)\u2014not a path substitute. type = rg --type. head_limit default 40 (0=unlimited); offset skips. multiline: . matches newlines. Respects .gitignore.";
     ripGrepSchema = Type2.Object({
       pattern: Type2.String(),
@@ -187166,13 +187557,50 @@ function normalizeSkillRef(input2) {
   }
   return { value: trimmed };
 }
+function stripTaskIdTruncation(id) {
+  const trimmed = id.trim();
+  const cleaned = trimmed.replace(/(?:\.{2,}|[?…]+)+$/u, "");
+  return { cleaned, truncated: cleaned !== trimmed };
+}
+function isUuidPrefix(value2) {
+  if (value2.length < 8 || value2.length >= 36) return false;
+  return /^[0-9a-f]{8}(?:-[0-9a-f]{0,4}){0,4}[0-9a-f]*$/i.test(value2);
+}
+function formatTaskIdSuggestions(matches) {
+  return matches.map((task) => `  - ${task.id}: ${task.title}`).join("\n");
+}
+async function resolveTaskById(db, projectId, rawId) {
+  const { cleaned, truncated } = stripTaskIdTruncation(rawId);
+  const exact = await getTaskById(db, rawId);
+  if (exact && exact.projectId === projectId) {
+    return { ok: true, id: exact.id, task: exact };
+  }
+  if (cleaned !== rawId) {
+    const cleanedMatch = await getTaskById(db, cleaned);
+    if (cleanedMatch && cleanedMatch.projectId === projectId) {
+      return { ok: true, id: cleanedMatch.id, task: cleanedMatch };
+    }
+  }
+  if (truncated || isUuidPrefix(cleaned)) {
+    const matches = (await getTasksByProject(db, projectId)).filter(
+      (task) => task.id.toLowerCase().startsWith(cleaned.toLowerCase())
+    );
+    if (matches.length === 1) {
+      return { ok: true, id: matches[0].id, task: matches[0] };
+    }
+    if (matches.length > 1) {
+      return {
+        ok: false,
+        error: `Error: task not found: ${rawId}. Similar ids:
+${formatTaskIdSuggestions(matches)}`
+      };
+    }
+  }
+  return { ok: false, error: `Error: task not found: ${rawId}` };
+}
 async function resolveTaskReference(db, projectId, id, reference, action) {
   if (id?.trim()) {
-    const existing = await getTaskById(db, id);
-    if (!existing || existing.projectId !== projectId) {
-      return { ok: false, error: `Error: task not found: ${id}` };
-    }
-    return { ok: true, id, task: existing };
+    return resolveTaskById(db, projectId, id.trim());
   }
   if (reference?.trim()) {
     const { exact, contains } = await findTasksByReference(db, projectId, reference.trim());
@@ -187398,8 +187826,14 @@ function createTasksTool(projectId, threadId, executionDeps) {
     if (tagIds) {
       rows = rows.filter((task) => tagIds.has(task.id));
     }
+    const serialized = await serializeTasksWithTags(db, rows);
     const payload = {
-      tasks: rows.map((task) => ({ id: task.id, title: task.title, status: task.status }))
+      tasks: serialized.map((task) => ({
+        id: task.id,
+        title: task.title,
+        status: task.status,
+        tags: task.tags.map((tag) => tag.name)
+      }))
     };
     if (trimmedQuery) payload.query = trimmedQuery;
     return jsonResult(payload);
@@ -187628,7 +188062,7 @@ var init_tasks = __esm({
     init_task_trigger_validation();
     init_task_default_model();
     VALID_STATUSES = ["Ready", "Plan", "Build", "Test", "Review", "Done"];
-    TASKS_TOOL_DESCRIPTION = "Project tasks. add/schedule: title+description required; optional tags, skillRef, trigger. list: id/title/status, hides Done; filter query/status/tags. get: full task. tags: vocabulary+counts. update any field (null clears trigger/skill). implement this chat; runNow new thread (scheduled/event only). delete. Target by id or unique reference. Skills load only at run.";
+    TASKS_TOOL_DESCRIPTION = "Project tasks. add/schedule: title+description required; optional tags, skillRef, trigger. list: id/title/status/tags, hides Done; filter query/status/tags. get: full task. tags: vocabulary+counts. update any field (null clears trigger/skill). implement this chat; runNow new thread (scheduled/event only). delete. Target by id or unique reference. Truncated ids resolve when unique. Skills load only at run.";
     tasksSchema = Type2.Object({
       action: Type2.Union([
         Type2.Literal("add"),
@@ -218227,8 +218661,8 @@ async function resolveInlineLlmModel(metadataManager, options2) {
     const resolved = await resolveModelAndKey(options2.provider, options2.model, metadataManager);
     return resolved ? { ...resolved, provider: options2.provider } : null;
   }
+  const db = await getDatabase();
   if (options2.threadId) {
-    const db = await getDatabase();
     const thread = await getThread(db, options2.threadId);
     if (thread?.modelProvider && thread.model) {
       const resolved = await resolveModelAndKey(
@@ -218239,14 +218673,28 @@ async function resolveInlineLlmModel(metadataManager, options2) {
       return resolved ? { ...resolved, provider: thread.modelProvider } : null;
     }
   }
+  try {
+    const defaultAlias = resolveModelAlias("default", await getModelAliases(db));
+    if (defaultAlias) {
+      const resolved = await resolveModelAndKey(
+        defaultAlias.provider,
+        defaultAlias.model,
+        metadataManager
+      );
+      return resolved ? { ...resolved, provider: defaultAlias.provider } : null;
+    }
+  } catch {
+  }
   return null;
 }
 var init_inline_model = __esm({
   "src/core/inline-model.ts"() {
     "use strict";
+    init_dist();
     init_git_utils();
     init_database();
     init_threads_database();
+    init_model_aliases_store();
   }
 });
 
@@ -223326,6 +223774,8 @@ var init_agent_executor_run = __esm({
       usageCompactCount = 0;
       pendingUsageCompact = false;
       skipUsageCompactOnce = false;
+      /** Compact/rollover payloads must not share the agent prompt-cache lane. */
+      compactPayloadLane = false;
       incompleteStopResumeCount = 0;
       observationHandler;
       harness;
@@ -223665,12 +224115,14 @@ ${prompt}` : prompt;
       }
       registerHarnessPayloadHandler() {
         this.harness.hooks.on("before_payload", (event) => {
+          const lane = this.compactPayloadLane ? "compact" : "agent";
           const payload = applyPromptCacheToProviderPayload(
             compactToolSchemasInPayload(event.payload),
             event.model.id,
             event.model.provider,
             this.sessionMetadata.id,
-            event.model.baseUrl
+            event.model.baseUrl,
+            lane
           );
           return { payload };
         });
@@ -223819,36 +224271,51 @@ ${prompt}` : prompt;
           return 0;
         }
       }
+      async withCompactCacheLane(run) {
+        this.compactPayloadLane = true;
+        try {
+          return await run();
+        } finally {
+          this.compactPayloadLane = false;
+        }
+      }
       async compactForOverflowResume(notice = OVERFLOW_COMPACT_NOTICE) {
         await this.lane.waitForIdle(this.runContext);
         const messagesBefore = await this.countSessionUserMessages();
         const contextBefore = await readContextMessages(this.session, this.runContext);
         const tokensBefore = estimateContextTokens(contextBefore).tokens;
-        if (this.persistentTurn && this.context.conversationId && this.context.projectId) {
-          await rolloverConversationContext(
-            {
-              db: this.persistentTurn.db,
-              harness: this.harness,
-              lane: this.lane,
-              session: this.session,
-              projectId: this.context.projectId,
-              threadId: this.context.threadId,
-              conversationId: this.context.conversationId,
-              requestModel: normalizeCompactModelId(
-                this.model,
-                this.providerName,
-                this.resolvedModel.id
-              ),
-              reason: this.pendingOverflowError ? "overflow" : "mid-turn",
-              projectMarker: false
-            },
-            this.runContext
+        const persistentTurn = this.persistentTurn;
+        const conversationId = this.context.conversationId;
+        const projectId = this.context.projectId;
+        if (persistentTurn && conversationId && projectId) {
+          await this.withCompactCacheLane(
+            () => rolloverConversationContext(
+              {
+                db: persistentTurn.db,
+                harness: this.harness,
+                lane: this.lane,
+                session: this.session,
+                projectId,
+                threadId: this.context.threadId,
+                conversationId,
+                requestModel: normalizeCompactModelId(
+                  this.model,
+                  this.providerName,
+                  this.resolvedModel.id
+                ),
+                reason: this.pendingOverflowError ? "overflow" : "mid-turn",
+                projectMarker: false
+              },
+              this.runContext
+            )
           );
         } else {
-          const result = await this.lane.compact(
-            { customInstructions: `${COMPACT_SUMMARY_PROMPT}
+          const result = await this.withCompactCacheLane(
+            () => this.lane.compact(
+              { customInstructions: `${COMPACT_SUMMARY_PROMPT}
 ${OVERFLOW_COMPACT_FOCUS}` },
-            this.runContext
+              this.runContext
+            )
           );
           if (Result.isErr(result)) {
             throw new Error(`Overflow compaction failed: ${result.error.message}`);
@@ -223918,7 +224385,6 @@ ${OVERFLOW_COMPACT_FOCUS}` },
               });
               return;
             }
-            clearPromptCacheSessionState(this.sessionMetadata.id);
             handlePromptError(err2, {
               eventQueue: this.eventQueue,
               promptRequest: this.promptRequest
@@ -226734,6 +227200,49 @@ var init_stream_helper = __esm({
   }
 });
 
+// src/features/chat/chat-auto-route.service.ts
+async function routePromptToDecision(prompt, aliases, metadataManager, dependencies = {}) {
+  const router = resolveAutoRouteModelAlias(aliases);
+  if (!router || !prompt.trim()) {
+    return "default";
+  }
+  try {
+    const modelResolver = dependencies.modelResolver ?? resolveModelAndKey;
+    const resolved = await modelResolver(router.provider, router.model, metadataManager);
+    if (!resolved) {
+      return "default";
+    }
+    const complete = dependencies.complete ?? completeSimpleWithSpend;
+    const response = await complete(
+      resolved.model,
+      {
+        systemPrompt: AUTO_ROUTE_SYSTEM_PROMPT,
+        messages: [
+          {
+            role: "user",
+            content: prompt.trim(),
+            timestamp: Date.now()
+          }
+        ]
+      },
+      { apiKey: resolved.apiKey },
+      router.provider
+    );
+    const raw2 = response.content.filter((block) => block.type === "text").map((block) => block.text).join("").trim();
+    return parseAutoRouteDecision(raw2) ?? "default";
+  } catch {
+    return "default";
+  }
+}
+var init_chat_auto_route_service = __esm({
+  "src/features/chat/chat-auto-route.service.ts"() {
+    "use strict";
+    init_dist();
+    init_git_utils();
+    init_spend_record();
+  }
+});
+
 // src/core/runtime-log-level.ts
 function syncRuntimeLogLevel(isDebug2) {
   setLogLevel(
@@ -227661,7 +228170,9 @@ function prepareChatRequest(c, body) {
     conversationId: requestedConversationId,
     attribution: rawAttribution,
     idempotencyKey: rawIdempotencyKey,
-    hideUserMessage: rawHideUserMessage
+    hideUserMessage: rawHideUserMessage,
+    runInBackground: rawRunInBackground,
+    autoRoute: rawAutoRoute
   } = body;
   if (!threadId || typeof threadId !== "string") {
     return {
@@ -227739,7 +228250,9 @@ function prepareChatRequest(c, body) {
       requestedConversationId,
       attribution: parseTurnAttribution(rawAttribution),
       ...idempotencyKey ? { idempotencyKey } : {},
-      hideUserMessage: rawHideUserMessage === true
+      hideUserMessage: rawHideUserMessage === true,
+      runInBackground: rawRunInBackground === true,
+      autoRoute: rawAutoRoute === true
     }
   };
 }
@@ -227888,7 +228401,9 @@ async function launchReservedChatTurn(args2) {
     return args2.c.json({
       ok: true,
       threadId: args2.deps.activeThreadId,
-      conversationId: args2.deps.conversationId
+      conversationId: args2.deps.conversationId,
+      model: args2.deps.model,
+      provider: args2.deps.provider
     });
   }
   return streamAsyncGenerator(args2.c, withCompleteSignal(), {
@@ -228033,7 +228548,9 @@ async function postChatMessage(c, threadManager, agentExecutor, conversationMana
       requestedConversationId,
       attribution,
       idempotencyKey,
-      hideUserMessage
+      autoRoute,
+      hideUserMessage,
+      runInBackground
     } = prepared.request;
     let provider = rawProvider;
     let model = baseModel;
@@ -228075,15 +228592,23 @@ async function postChatMessage(c, threadManager, agentExecutor, conversationMana
       });
       return conversationBusyResponse(c, activeThreadId, conversationId);
     }
+    const db = await getDatabase();
+    const project = await getProject(db, thread.projectId);
+    const seatbeltSandboxEnabled = await resolveSeatbeltSandboxEnabled(db);
+    const modelAliases = await getModelAliases(db);
+    if (autoRoute) {
+      const decision = await routePromptToDecision(userContent, modelAliases, metadataManager);
+      const routedAlias = decision === "cheap" ? resolveModelAlias("cheap", modelAliases) : decision === "smart" ? resolveSmartModelAlias(modelAliases) : null;
+      if (routedAlias) {
+        model = routedAlias.model;
+        provider = routedAlias.provider;
+      }
+    }
     const { availableSkills, activatedSkills, agents } = await loadSkillAndAgentContext(
       thread,
       threadPath,
       userContent
     );
-    const db = await getDatabase();
-    const project = await getProject(db, thread.projectId);
-    const seatbeltSandboxEnabled = await resolveSeatbeltSandboxEnabled(db);
-    const modelAliases = await getModelAliases(db);
     const orchestrated = resolveOrchestrateModel(c, modelAliases, orchestrateMode, model, provider);
     if (!orchestrated.ok) {
       return orchestrated.response;
@@ -228130,7 +228655,10 @@ async function postChatMessage(c, threadManager, agentExecutor, conversationMana
     reservedRun = { threadId: activeThreadId, conversationId };
     return captureMessageAndLaunch({
       c,
-      options: options2,
+      options: {
+        ...options2,
+        runInBackground: options2?.runInBackground === true || runInBackground === true
+      },
       thread,
       threadManager,
       conversationManager,
@@ -228185,6 +228713,7 @@ var init_chat_post_route = __esm({
     init_conversations_content();
     init_route_helpers();
     init_error_responses();
+    init_chat_auto_route_service();
     init_database();
     init_database_state();
     init_account_settings_route();
@@ -228351,6 +228880,17 @@ function buildMessageMetadata(tokenCount, estimatedCost, processingTimeMs) {
   };
 }
 function buildAgentMessage(message, response, pricingByModelId, threadModelId) {
+  if (isTarskAgentNoteModel(message.request.model)) {
+    const { content: sanitizedContent2 } = sanitizeStructuredMessageContent(response.content);
+    return {
+      messageId: `agent-${message.id}`,
+      sender: "agent",
+      content: sanitizedContent2,
+      contentType: "markdown",
+      timestamp: response.completedAt,
+      senderLabel: TARSK_AGENT_NOTE_LABEL
+    };
+  }
   const usageFromEvents = extractUsageFromEvents(response.events);
   const tokenCount = resolveTokenCount(usageFromEvents, message);
   const estimatedCost = resolveEstimatedCost(
@@ -228497,49 +229037,6 @@ var init_chat_compact_route = __esm({
   }
 });
 
-// src/features/chat/chat-auto-route.service.ts
-async function routePromptToDecision(prompt, aliases, metadataManager, dependencies = {}) {
-  const router = resolveAutoRouteModelAlias(aliases);
-  if (!router || !prompt.trim()) {
-    return "default";
-  }
-  try {
-    const modelResolver = dependencies.modelResolver ?? resolveModelAndKey;
-    const resolved = await modelResolver(router.provider, router.model, metadataManager);
-    if (!resolved) {
-      return "default";
-    }
-    const complete = dependencies.complete ?? completeSimpleWithSpend;
-    const response = await complete(
-      resolved.model,
-      {
-        systemPrompt: AUTO_ROUTE_SYSTEM_PROMPT,
-        messages: [
-          {
-            role: "user",
-            content: prompt.trim(),
-            timestamp: Date.now()
-          }
-        ]
-      },
-      { apiKey: resolved.apiKey },
-      router.provider
-    );
-    const raw2 = response.content.filter((block) => block.type === "text").map((block) => block.text).join("").trim();
-    return parseAutoRouteDecision(raw2) ?? "default";
-  } catch {
-    return "default";
-  }
-}
-var init_chat_auto_route_service = __esm({
-  "src/features/chat/chat-auto-route.service.ts"() {
-    "use strict";
-    init_dist();
-    init_git_utils();
-    init_spend_record();
-  }
-});
-
 // src/features/chat/chat-auto-route.route.ts
 async function handleAutoRoute(c, threadManager, metadataManager) {
   const threadId = c.req.param("threadId");
@@ -228786,6 +229283,85 @@ var init_chat_delete_route = __esm({
   }
 });
 
+// src/features/chat/chat-agent-note.route.ts
+import { randomUUID as randomUUID17 } from "crypto";
+async function postAgentNote(c, threadManager, conversationManager) {
+  try {
+    const threadIdResult = requireThreadIdParam(c);
+    if (!threadIdResult.ok) {
+      return threadIdResult.response;
+    }
+    const { threadId } = threadIdResult;
+    let body = {};
+    try {
+      body = await c.req.json();
+    } catch {
+      return errorResponse(c, ErrorCodes.REQUEST_PARSE_ERROR, "Invalid JSON body", 400);
+    }
+    const content = typeof body.content === "string" ? body.content.trim() : "";
+    if (!content) {
+      return errorResponse(c, ErrorCodes.INVALID_REQUEST, "content is required", 400);
+    }
+    const threadResult = await requireThread(c, threadManager, threadId);
+    if (!threadResult.ok) {
+      return threadResult.response;
+    }
+    const { thread } = threadResult;
+    const requestedConversationId = typeof body.conversationId === "string" ? body.conversationId.trim() : "";
+    let conversationId = requestedConversationId || thread.currentConversationId;
+    if (!conversationId) {
+      conversationId = randomUUID17();
+      await threadManager.updateThread(threadId, { currentConversationId: conversationId });
+    }
+    const messageId = await conversationManager.startMessage(
+      threadId,
+      thread.path ?? "",
+      conversationId,
+      "",
+      TARSK_AGENT_NOTE_MODEL
+    );
+    await conversationManager.completeMessage(messageId, content, [
+      { type: "message", role: "assistant", content }
+    ]);
+    if (body.markComplete === true) {
+      await conversationManager.markConversationComplete(threadId, conversationId);
+    }
+    const history2 = await conversationManager.getConversationHistoryByConversationId(
+      threadId,
+      conversationId
+    );
+    const inserted = history2?.messages.find((message) => message.id === messageId);
+    if (!inserted) {
+      return errorResponse(
+        c,
+        ErrorCodes.INTERNAL_ERROR,
+        "Failed to load the inserted agent note",
+        500
+      );
+    }
+    const [mapped] = mapConversationMessagesToThreadResponse([inserted]);
+    return successResponse(c, mapped);
+  } catch (error2) {
+    return errorResponse(
+      c,
+      ErrorCodes.INTERNAL_ERROR,
+      "Failed to insert agent note",
+      500,
+      error2 instanceof Error ? error2.message : String(error2)
+    );
+  }
+}
+var init_chat_agent_note_route = __esm({
+  "src/features/chat/chat-agent-note.route.ts"() {
+    "use strict";
+    init_dist();
+    init_threads_messages_mapper();
+    init_conversation_route_params();
+    init_route_helpers();
+    init_error_responses();
+  }
+});
+
 // src/features/chat/chat-subscribe.route.ts
 function flushPendingAssistantContent(state3, target) {
   const chunks = state3.pendingChunks;
@@ -229177,6 +229753,7 @@ function createChatRoutes(threadManager, agentExecutor, conversationManager, pro
     "/:threadId/workspace-handoff",
     (c) => handleWorkspaceHandoff(c, threadManager, conversationManager, metadataManager)
   );
+  router.post("/:threadId/agent-note", (c) => postAgentNote(c, threadManager, conversationManager));
   router.post(
     "/:threadId/steer",
     (c) => steerChatMessage(c, agentExecutor, processingStateManager, conversationManager)
@@ -229196,6 +229773,7 @@ var init_chat_routes = __esm({
     init_chat_auto_route_route();
     init_chat_workspace_handoff_route();
     init_chat_delete_route();
+    init_chat_agent_note_route();
     init_chat_subscribe_route();
     init_chat_buffer_route();
     init_chat_stop_route();
@@ -229284,6 +229862,9 @@ var init_conversations_manager = __esm({
           if (!this.db) {
             await this.initialize();
           }
+          if (message.trim()) {
+            await unmarkConversationComplete(this.db, threadId, conversationId);
+          }
           const messageId = await insertMessage(
             this.db,
             threadId,
@@ -229590,6 +230171,14 @@ var init_conversations_manager = __esm({
        * Removes a conversation's read mark so it returns to the unread Chats
        * list. Used when the user resumes a chat from History.
        */
+      async markConversationComplete(threadId, conversationId) {
+        try {
+          await markConversationComplete(this.db, threadId, conversationId);
+        } catch (error2) {
+          log83.error("Failed to mark conversation complete", { error: error2, threadId, conversationId });
+          throw error2;
+        }
+      }
       async unmarkConversationRead(threadId, conversationId) {
         try {
           await unmarkConversationRead(this.db, threadId, conversationId);
@@ -230177,7 +230766,8 @@ async function getRecentConversations2(c, conversationManager) {
       inputTokens: Number(conversation.inputTokens) || 0,
       outputTokens: Number(conversation.outputTokens) || 0,
       model: conversation.model,
-      branch: conversation.branch
+      branch: conversation.branch,
+      isComplete: Boolean(conversation.isComplete)
     }));
     return successResponse(c, { conversations, total, limit: safeLimit, offset: safeOffset }, 200);
   } catch (error2) {
@@ -238998,7 +239588,7 @@ var init_projects_routes = __esm({
 });
 
 // src/features/git/git-auth.broker.ts
-import { randomUUID as randomUUID17 } from "crypto";
+import { randomUUID as randomUUID18 } from "crypto";
 var GitAuthBroker;
 var init_git_auth_broker = __esm({
   "src/features/git/git-auth.broker.ts"() {
@@ -239010,7 +239600,7 @@ var init_git_auth_broker = __esm({
        * with the credential, or null when the user cancelled the dialog.
        */
       begin(context2) {
-        const authId = randomUUID17();
+        const authId = randomUUID18();
         const credential = new Promise((resolve21) => {
           this.pending.set(authId, {
             resolve: (value2) => {
@@ -240389,7 +240979,7 @@ var init_random_words = __esm({
 });
 
 // src/features/projects/projects.creator.ts
-import { randomUUID as randomUUID18 } from "crypto";
+import { randomUUID as randomUUID19 } from "crypto";
 import { basename as basename7, dirname as dirname16, join as join40, relative as relative11, resolve as resolvePath5, sep as sep6 } from "path";
 import { realpathSync as realpathSync2 } from "fs";
 import { access as access7, mkdir as mkdir9, rm as rm6, stat as stat11, readdir as readdir11, writeFile as writeFile12 } from "fs/promises";
@@ -240692,14 +241282,14 @@ var init_projects_creator = __esm({
         }
         let initialThreadId;
         try {
-          const projectId = randomUUID18();
+          const projectId = randomUUID19();
           const existingProjects = await this.metadataManager.loadProjects();
           const existingNames = existingProjects.map((p) => p.name);
           const projectName = this.ensureUniqueProjectName(
             this.deriveProjectName(gitUrl),
             existingNames
           );
-          initialThreadId = randomUUID18();
+          initialThreadId = randomUUID19();
           const initialThreadTitle = generateRandomHyphenatedName();
           const baseFolderName = this.toFolderName(this.deriveProjectName(gitUrl));
           if (!baseFolderName) {
@@ -240796,8 +241386,8 @@ var init_projects_creator = __esm({
           };
           return;
         }
-        const projectId = randomUUID18();
-        const initialThreadId = randomUUID18();
+        const projectId = randomUUID19();
+        const initialThreadId = randomUUID19();
         const initialThreadTitle = generateRandomHyphenatedName();
         this.processingStateManager?.setProcessing(initialThreadId);
         try {
@@ -240906,8 +241496,8 @@ var init_projects_creator = __esm({
           };
           return;
         }
-        const projectId = randomUUID18();
-        const initialThreadId = randomUUID18();
+        const projectId = randomUUID19();
+        const initialThreadId = randomUUID19();
         const initialThreadTitle = generateRandomHyphenatedName();
         const { signal } = options2 ?? {};
         let folderPath;
@@ -241001,7 +241591,7 @@ var init_projects_creator = __esm({
           yield { type: "error", message: "Could not derive a valid folder name from the zip" };
           return;
         }
-        let projectId = randomUUID18();
+        let projectId = randomUUID19();
         let projectNameToPersist = projectName;
         if (options2?.signal?.aborted) {
           return;
@@ -241015,7 +241605,7 @@ var init_projects_creator = __esm({
           projectId = overrideProjectId;
           projectNameToPersist = result.name;
         }
-        const initialThreadId = randomUUID18();
+        const initialThreadId = randomUUID19();
         const initialThreadTitle = generateRandomHyphenatedName();
         let folderPath;
         let projectMetadataSaved = false;
@@ -241184,8 +241774,8 @@ var init_projects_creator = __esm({
           };
           return;
         }
-        const projectId = randomUUID18();
-        const initialThreadId = randomUUID18();
+        const projectId = randomUUID19();
+        const initialThreadId = randomUUID19();
         const initialThreadTitle = generateRandomHyphenatedName();
         this.processingStateManager?.setProcessing(initialThreadId);
         try {
@@ -242705,11 +243295,91 @@ var init_providers_open_external_route = __esm({
   }
 });
 
+// src/features/providers/providers-openrouter-oauth.route.ts
+function encodeBase64Url(bytes) {
+  let binary = "";
+  for (const byte of bytes) binary += String.fromCharCode(byte);
+  return btoa(binary).replaceAll("+", "-").replaceAll("/", "_").replace(/=+$/, "");
+}
+async function createPkcePair() {
+  const verifierBytes = new Uint8Array(32);
+  crypto.getRandomValues(verifierBytes);
+  const verifier = encodeBase64Url(verifierBytes);
+  const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(verifier));
+  return { verifier, challenge: encodeBase64Url(new Uint8Array(digest)) };
+}
+function removeExpiredAuthorizations() {
+  const now = Date.now();
+  for (const [state3, authorization] of pendingAuthorizations) {
+    if (now - authorization.createdAt > PENDING_TTL_MS) pendingAuthorizations.delete(state3);
+  }
+}
+async function startOpenRouterOAuth(c) {
+  removeExpiredAuthorizations();
+  const { verifier, challenge } = await createPkcePair();
+  const stateBytes = new Uint8Array(24);
+  crypto.getRandomValues(stateBytes);
+  const state3 = encodeBase64Url(stateBytes);
+  const callbackUrl = new URL("/api/providers/openrouter/oauth/callback", c.req.url).toString();
+  pendingAuthorizations.set(state3, { verifier, callbackUrl, createdAt: Date.now() });
+  const authorizationUrl = new URL(OPENROUTER_AUTH_URL);
+  authorizationUrl.searchParams.set("callback_url", callbackUrl);
+  authorizationUrl.searchParams.set("code_challenge", challenge);
+  authorizationUrl.searchParams.set("code_challenge_method", "S256");
+  authorizationUrl.searchParams.set("key_label", "Tarsk");
+  authorizationUrl.searchParams.set("state", state3);
+  return c.json({ url: authorizationUrl.toString() });
+}
+async function completeOpenRouterOAuth(c, metadataManager) {
+  const code = new URL(c.req.url).searchParams.get("code");
+  const state3 = new URL(c.req.url).searchParams.get("state");
+  if (!code || !state3) return c.text("Missing OAuth code or state", 400);
+  const pending2 = pendingAuthorizations.get(state3);
+  pendingAuthorizations.delete(state3);
+  if (!pending2 || Date.now() - pending2.createdAt > PENDING_TTL_MS) {
+    return c.text("This OAuth session has expired. Return to Tarsk and try again.", 400);
+  }
+  const response = await fetch(OPENROUTER_EXCHANGE_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      code,
+      code_verifier: pending2.verifier,
+      code_challenge_method: "S256"
+    })
+  });
+  if (!response.ok)
+    return c.text("OpenRouter authorization could not be completed. Try again.", 502);
+  const result = await response.json();
+  if (!result.key) return c.text("OpenRouter did not return an API key. Try again.", 502);
+  await metadataManager.saveProviderKey("openrouter", result.key);
+  const keyName = await resolveProviderKeyName("openrouter");
+  if (keyName) {
+    updateRuntimeEnv({ [keyName]: result.key });
+    await updateEnvFile({ [keyName]: result.key });
+  }
+  return c.html("<h1>OpenRouter connected</h1><p>You can close this tab and return to Tarsk.</p>");
+}
+var OPENROUTER_AUTH_URL, OPENROUTER_EXCHANGE_URL, PENDING_TTL_MS, pendingAuthorizations;
+var init_providers_openrouter_oauth_route = __esm({
+  "src/features/providers/providers-openrouter-oauth.route.ts"() {
+    "use strict";
+    init_env_manager();
+    init_provider_resolver();
+    OPENROUTER_AUTH_URL = "https://openrouter.ai/auth";
+    OPENROUTER_EXCHANGE_URL = "https://openrouter.ai/api/v1/auth/keys";
+    PENDING_TTL_MS = 10 * 60 * 1e3;
+    pendingAuthorizations = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/features/providers/providers.routes.ts
 function createProviderRoutes(metadataManager) {
   const router = new Hono2();
   router.get("/", (c) => getProviders(c, metadataManager));
   router.post("/open-external", (c) => openExternalUrl(c));
+  router.get("/openrouter/oauth/start", (c) => startOpenRouterOAuth(c));
+  router.get("/openrouter/oauth/callback", (c) => completeOpenRouterOAuth(c, metadataManager));
   router.post("/keys", (c) => postProviderKeys(c, metadataManager));
   router.post("/bulk-keys", (c) => postProviderBulkKeys(c, metadataManager));
   router.post("/env", (c) => postProviderEnv(c, metadataManager));
@@ -242728,6 +243398,7 @@ var init_providers_routes = __esm({
     init_providers_get_credits_route();
     init_providers_get_logo_route();
     init_providers_open_external_route();
+    init_providers_openrouter_oauth_route();
   }
 });
 
@@ -243985,7 +244656,7 @@ var init_thread_folder_name = __esm({
 });
 
 // src/features/threads/thread-copy-clone.ts
-import { randomUUID as randomUUID19 } from "crypto";
+import { randomUUID as randomUUID20 } from "crypto";
 import { readdir as readdir13, rename as rename5, stat as stat12, rm as rm8 } from "fs/promises";
 import { join as join45 } from "path";
 function supportsCopyOnWriteClone() {
@@ -244060,7 +244731,7 @@ async function cloneDirectoryTree(sourcePath, targetPath) {
   if (typeof Worker === "undefined") {
     return { ok: false, error: "workers are unavailable in this runtime" };
   }
-  const stagingPath = `${targetPath}.copying-${randomUUID19().slice(0, 8)}`;
+  const stagingPath = `${targetPath}.copying-${randomUUID20().slice(0, 8)}`;
   let worker;
   try {
     const workerUrl = URL.createObjectURL(
@@ -244213,7 +244884,7 @@ self.onmessage = (event) => {
 });
 
 // src/features/threads/threads.manager.ts
-import { randomUUID as randomUUID20 } from "crypto";
+import { randomUUID as randomUUID21 } from "crypto";
 import { join as join46 } from "path";
 import { execSync as execSync3 } from "child_process";
 import { rm as rm9, stat as stat13, mkdir as mkdir11 } from "fs/promises";
@@ -244305,13 +244976,13 @@ var init_threads_manager = __esm({
             return;
           }
           await this.ensureProjectDirectory(project.path);
-          threadId = randomUUID20();
+          threadId = randomUUID21();
           const threadTitle = await this.resolveThreadTitle(projectId, title);
           const threadPath = await this.generateThreadPath(project.gitUrl, project.name);
           this.processingStateManager?.setProcessing(threadId);
           yield {
             type: "progress",
-            message: `Creating thread "${threadTitle}" for project "${project.name}"...`,
+            message: `Creating workspace "${threadTitle}" for project "${project.name}"...`,
             threadId
           };
           let populateFailed = false;
@@ -244761,7 +245432,7 @@ var init_threads_manager = __esm({
         const shouldDeleteProject = isProjectRoot && project.threads.length === 0;
         if (project.threads.length === 0 && isBuiltInBot(project)) {
           const replacement = {
-            id: randomUUID20(),
+            id: randomUUID21(),
             projectId: project.id,
             title: generateRandomHyphenatedName(),
             path: project.path,
@@ -245186,7 +245857,7 @@ var init_threads_delete_route = __esm({
 });
 
 // src/features/project-scripts/project-scripts.database.ts
-import { randomUUID as randomUUID21 } from "crypto";
+import { randomUUID as randomUUID22 } from "crypto";
 async function getScriptsByProject(db, projectId) {
   const result = await db.execute({
     sql: `SELECT id, projectId, workspace, name, command, friendlyName, updatedAt
@@ -245203,7 +245874,7 @@ async function upsertProjectScripts(projectId, scripts) {
       sql: `INSERT OR REPLACE INTO project_scripts (id, projectId, workspace, name, command, friendlyName, updatedAt)
             VALUES (?, ?, ?, ?, ?, ?, ?)`,
       args: [
-        randomUUID21(),
+        randomUUID22(),
         projectId,
         script.workspace,
         script.name,
@@ -404562,7 +405233,11 @@ async function gitCreateBranchHandler(c, metadataManager) {
     } catch {
       return c.json({ error: `Path is not a git repository: ${absolutePath}` }, 400);
     }
-    const baseBranch = body.baseBranch ?? await findDefaultBranch(gitRoot) ?? void 0;
+    const previousBranch = await getCurrentBranch(gitRoot);
+    const baseBranch = body.baseBranch ?? await findDefaultBranch(gitRoot);
+    if (!baseBranch) {
+      return c.json({ error: "Could not determine the default branch" }, 400);
+    }
     let branchName = body.branchName ? sanitizeBranchName(body.branchName) : sanitizeBranchName(generateRandomHyphenatedName());
     if (!branchName) {
       return c.json({ error: "Invalid branch name" }, 400);
@@ -404576,7 +405251,7 @@ async function gitCreateBranchHandler(c, metadataManager) {
     }
     await createAndCheckoutBranch(gitRoot, branchName, baseBranch);
     await updateThreadCurrentBranch(metadataManager, threadId, branchName);
-    return c.json({ success: true, branchName });
+    return c.json({ success: true, branchName, previousBranch, baseBranch });
   } catch (error2) {
     const message = error2 instanceof Error ? error2.message : "Failed to create branch";
     return c.json({ error: message }, 500);
@@ -440546,7 +441221,7 @@ var init_slack_shared = __esm({
 });
 
 // src/features/slack/slack.dispatch.ts
-import { randomUUID as randomUUID22 } from "crypto";
+import { randomUUID as randomUUID23 } from "crypto";
 function clearBackgroundTurnRecovery() {
   backgroundTurnRecovery.clear();
 }
@@ -440812,7 +441487,7 @@ async function resolveOrCreateChannelThread(ctx, params) {
     return { ok: false };
   }
   const tarskThreadId = createdThread.id;
-  const nextConversationId = conversationId ?? randomUUID22();
+  const nextConversationId = conversationId ?? randomUUID23();
   const nextSlackMode = slackMode ?? (claimChannelDefault ? "plan" : "branch");
   await announceChannelBranchReady(ctx, {
     channelId,
@@ -440945,7 +441620,7 @@ async function claimChannelDefaultOwnership(ctx, params) {
     log139.warn("Failed to delete duplicate channel default clone", { error: error2, tarskThreadId });
   }
   const winnerThreadId = claim.existing.defaultTarskThreadId;
-  const conversationId = randomUUID22();
+  const conversationId = randomUUID23();
   await upsertSlackThreadMap({
     slackTeamId: teamId,
     slackChannelId: channelId,
@@ -441171,7 +441846,7 @@ async function resolveSlackConversationId(ctx, params) {
       return thread.currentConversationId;
     }
   }
-  const conversationId = randomUUID22();
+  const conversationId = randomUUID23();
   await ctx.deps.threadManager.updateThread(tarskThreadId, {
     currentConversationId: conversationId
   });
@@ -441195,7 +441870,7 @@ var init_slack_dispatch = __esm({
 });
 
 // src/features/slack/slack.branch.ts
-import { randomUUID as randomUUID23 } from "crypto";
+import { randomUUID as randomUUID24 } from "crypto";
 async function handleBranchCommand(ctx, params) {
   const { teamId, channelId, userId, messageTs, prompt, attachments, projectId } = params;
   const project = await ctx.deps.projectManager.getProject(projectId);
@@ -441282,7 +441957,7 @@ async function remapSlackThreadToBranch(ctx, params) {
     threadTitle,
     slackMode: "branch",
     isNewConversation: true,
-    conversationId: randomUUID23(),
+    conversationId: randomUUID24(),
     clearPendingPropose: true
   });
 }
@@ -442171,7 +442846,7 @@ var init_slack_attachments = __esm({
 });
 
 // src/features/slack/slack.mentions.ts
-import { randomUUID as randomUUID24 } from "crypto";
+import { randomUUID as randomUUID25 } from "crypto";
 function messageMentionsBot(event, botUserId) {
   const text = event.text;
   if (!botUserId || !text) {
@@ -442266,7 +442941,7 @@ async function handleAppMention(ctx, event, body) {
   }
   const defaultTarget = await resolveChannelDefaultTarget(ctx, teamId, channelId, binding);
   if (defaultTarget) {
-    const conversationId2 = randomUUID24();
+    const conversationId2 = randomUUID25();
     await upsertSlackThreadMap({
       slackTeamId: teamId,
       slackChannelId: channelId,
@@ -442305,7 +442980,7 @@ async function handleAppMention(ctx, event, body) {
     });
     return;
   }
-  const conversationId = randomUUID24();
+  const conversationId = randomUUID25();
   const channelLabel = binding.slackChannelName ?? await resolveSlackChannelName(ctx.getWeb(), channelId);
   await dispatchChannelPrompt(ctx, {
     teamId,
@@ -443486,7 +444161,7 @@ var init_file_routes = __esm({
 
 // src/features/browser-js/browser-js.routes.ts
 import { homedir as homedir11 } from "node:os";
-import { randomUUID as randomUUID25 } from "node:crypto";
+import { randomUUID as randomUUID26 } from "node:crypto";
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
 function prepareSmartJsArguments(params, output2) {
   const validated = validateSmartJsOutput(output2);
@@ -443612,7 +444287,7 @@ async function resolveExecutionTool(args2) {
   return tools[args2.toolName];
 }
 async function executeAndCaptureSmartJsResult(args2) {
-  const executionId = randomUUID25();
+  const executionId = randomUUID26();
   let result;
   try {
     result = await args2.tool.execute(executionId, args2.executionParams);
@@ -444234,7 +444909,7 @@ var init_logs_routes = __esm({
 });
 
 // src/features/user-tasks/user-tasks.database.ts
-import { randomUUID as randomUUID26 } from "crypto";
+import { randomUUID as randomUUID27 } from "crypto";
 async function getUserTasksByProject(db, projectId) {
   const result = await db.execute({
     sql: `SELECT id, projectId, content, createdAt, updatedAt
@@ -444247,7 +444922,7 @@ async function getUserTasksByProject(db, projectId) {
 }
 async function insertUserTask(projectId, content) {
   const db = await getDatabase();
-  const id = randomUUID26();
+  const id = randomUUID27();
   const now = (/* @__PURE__ */ new Date()).toISOString();
   await db.execute({
     sql: `INSERT INTO user_tasks (id, projectId, content, createdAt, updatedAt)