tarsk 0.5.82 → 0.5.83

package/dist/index.js

@@ -1747,7 +1747,13 @@ var init_tool_display = __esm({
         activeDisplayName: "Reading Reference"
       },
       { name: "run_js", enabled: true, displayName: "Run JS", activeDisplayName: "Running JS" },
-      { name: "todo", enabled: true, displayName: "Todo", activeDisplayName: "Updating" },
+      {
+        name: "todo",
+        enabled: true,
+        defaultEnabled: false,
+        displayName: "Todo",
+        activeDisplayName: "Updating"
+      },
       { name: "tasks", enabled: true, displayName: "Tasks", activeDisplayName: "Managing Tasks" },
       {
         name: "tool_search",
@@ -2202,11 +2208,11 @@ function parseProjectSettingsDocument(raw2) {
   };
 }
 function migrateDefaultOffTools(settings3, version3) {
-  if (version3 !== null && version3 >= 2) {
+  if (version3 !== null && version3 >= 3) {
     return false;
   }
   const defaults3 = getDefaultOffToolNames();
-  const needsVersionBump = version3 === null || version3 < 2;
+  const needsVersionBump = version3 === null || version3 < 3;
   if (defaults3.length === 0) {
     return needsVersionBump;
   }
@@ -2273,7 +2279,7 @@ function projectToSettingsPatch(project) {
     setupScript: project.setupScript?.trim() ? project.setupScript : null,
     runCommand: project.runCommand?.trim() ? project.runCommand : null,
     commitMethod: project.commitMethod ?? null,
-    disabledTools: project.disabledTools ?? [],
+    disabledTools: project.disabledTools ?? getDefaultOffToolNames(),
     commands: project.commands ?? []
   };
 }
@@ -2335,7 +2341,7 @@ var init_project_settings = __esm({
     init_commit_methods();
     init_project_tools();
     init_tool_display();
-    PROJECT_SETTINGS_VERSION = 2;
+    PROJECT_SETTINGS_VERSION = 3;
     PROJECT_SETTINGS_FILENAME = "tarsk-project.json";
     PROJECT_ICON_FILENAME = "tarsk-project-icon.png";
     PNG_DATA_URL_PREFIX = "data:image/png;base64,";
@@ -4234,7 +4240,7 @@ function toBufferedLogData(data) {
   return toJsonSafeLogData(data);
 }
 function createLogger(event) {
-  function log160(level, message, data) {
+  function log161(level, message, data) {
     const willBuffer = level >= LOG_BUFFER_MIN_LEVEL && level < LogLevel.SILENT;
     const willEmit = level >= globalLevel;
     if (!willBuffer && !willEmit) {
@@ -4256,10 +4262,10 @@ function createLogger(event) {
     emit(entry);
   }
   return {
-    debug: (message, data) => log160(LogLevel.DEBUG, message, data),
-    info: (message, data) => log160(LogLevel.INFO, message, data),
-    warn: (message, data) => log160(LogLevel.WARN, message, data),
-    error: (message, data) => log160(LogLevel.ERROR, message, data)
+    debug: (message, data) => log161(LogLevel.DEBUG, message, data),
+    info: (message, data) => log161(LogLevel.INFO, message, data),
+    warn: (message, data) => log161(LogLevel.WARN, message, data),
+    error: (message, data) => log161(LogLevel.ERROR, message, data)
   };
 }
 var LogLevel, LOG_BUFFER_CAPACITY, LOG_BUFFER_MIN_LEVEL, LOG_LEVEL_NAMES, globalLevel, transports, nextBufferId, logBuffer, logBufferListeners, LEVEL_CONSOLE;
@@ -14688,7 +14694,7 @@ var init_public_tunnel = __esm({
   "../shared/dist/public-tunnel.js"() {
     "use strict";
     PUBLIC_TUNNEL_ORIGIN = "https://home.tarsk.io";
-    PUBLIC_TUNNEL_ZONE = "packageup.io";
+    PUBLIC_TUNNEL_ZONE = "tarsk.net";
     PUBLIC_TUNNEL_CLAIM_PATH = "/_tarsk/claim";
     PUBLIC_TUNNEL_SECRET_HEADER = "x-tarsk-tunnel-secret";
     TUNNEL_ACCESS_COOKIE = "tarsk_tunnel_access";
@@ -38108,6 +38114,12 @@ var init_conversation_usage = __esm({
 
 // src/features/conversations/conversations.database.ts
 import { randomUUID } from "crypto";
+function historyEventProjection(options2) {
+  if (options2?.omitEvents) {
+    return "NULL AS response_events";
+  }
+  return `${RESPONSE_EVENTS_DISPLAY_SQL} AS response_events`;
+}
 function extractAssistantText(content) {
   if (typeof content === "string") {
     return content;
@@ -38683,8 +38695,9 @@ async function updateMessage(db, messageId, content, events, imageUrl, requestMo
     throw error2;
   }
 }
-async function getConversationHistory(db, threadId) {
+async function getConversationHistory(db, threadId, options2) {
   try {
+    const eventProjection = historyEventProjection(options2);
     const result = await db.execute(
       `
       SELECT
@@ -38692,7 +38705,7 @@ async function getConversationHistory(db, threadId) {
         request_message, request_model, request_attachments, request_steeringMessages,
         request_planMode, request_ralphMode, request_orchestrateMode,
         request_imageMode, request_checkpointRef, request_attribution,
-        response_content, ${RESPONSE_EVENTS_DISPLAY_SQL} AS response_events, response_completedAt,
+        response_content, ${eventProjection}, response_completedAt,
         response_imageUrl, response_summary, input_tokens, output_tokens,
         agent_session_id, agent_session_entry_start_seq, agent_session_entry_end_seq
       FROM conversation_history
@@ -38733,9 +38746,10 @@ async function getDeletedConversationHistory(db, threadId) {
     throw error2;
   }
 }
-async function getConversationHistoryByConversationId(db, threadId, conversationId, eventLimit) {
+async function getConversationHistoryByConversationId(db, threadId, conversationId, eventLimit, options2) {
   try {
-    const eventProjection = eventLimit === void 0 ? `${RESPONSE_EVENTS_DISPLAY_SQL} AS response_events` : `CASE WHEN id IN (
+    const omitEvents = options2?.omitEvents === true;
+    const eventProjection = omitEvents ? historyEventProjection(options2) : eventLimit === void 0 ? `${RESPONSE_EVENTS_DISPLAY_SQL} AS response_events` : `CASE WHEN id IN (
             SELECT recent.id
             FROM conversation_history recent
             WHERE recent.threadId = ?
@@ -38759,7 +38773,7 @@ async function getConversationHistoryByConversationId(db, threadId, conversation
       WHERE threadId = ? AND conversationId = ? AND status = ?
       ORDER BY timestamp ASC
     `,
-      eventLimit === void 0 ? [threadId, conversationId, "active"] : [
+      omitEvents || eventLimit === void 0 ? [threadId, conversationId, "active"] : [
         threadId,
         conversationId,
         "active",
@@ -39164,24 +39178,29 @@ async function markConversationHistoryAsDeleted(db, threadId) {
     throw error2;
   }
 }
-async function getConversationIds(db, threadId) {
+async function queryConversationIds(db, threadId, sql, failureLog) {
   try {
-    const result = await db.execute(
-      `
-      SELECT conversationId FROM conversation_history
-      WHERE threadId = ?
-      GROUP BY conversationId
-      ORDER BY conversationId DESC
-    `,
-      [threadId]
-    );
+    const result = await db.execute(sql, [threadId]);
     const rows = result.rows;
     return rows.map((row) => row.conversationId);
   } catch (error2) {
-    log6.error("Failed to get conversation IDs", { error: error2, threadId });
+    log6.error(failureLog, { error: error2, threadId });
     throw error2;
   }
 }
+async function getConversationIds(db, threadId) {
+  return queryConversationIds(
+    db,
+    threadId,
+    `
+      SELECT conversationId FROM conversation_history
+      WHERE threadId = ?
+      GROUP BY conversationId
+      ORDER BY conversationId DESC
+    `,
+    "Failed to get conversation IDs"
+  );
+}
 async function getRecentConversations(db, limit3, offset = 0, projectId, excludeRead = false, order = DEFAULT_RECENT_CONVERSATIONS_ORDER) {
   try {
     const projectFilter = projectId ? "INNER JOIN threads ON threads.id = turns.threadId AND threads.projectId = ?" : "";
@@ -39279,6 +39298,7 @@ async function getRecentConversations(db, limit3, offset = 0, projectId, exclude
           FROM conversation_completions completions
           WHERE completions.threadId = recent.threadId
             AND completions.conversationId = recent.conversationId
+            AND completions.dismissedAt IS NULL
         ) as isComplete
       FROM recent_conversations recent
       -- LEFT JOIN so a conversation with no turns yet still comes back, with
@@ -39382,22 +39402,114 @@ async function markConversationRead(db, threadId, conversationId) {
   }
 }
 async function markConversationComplete(db, threadId, conversationId) {
-  await db.execute(
-    `
+  try {
+    await db.execute(
+      `
       INSERT INTO conversation_completions (threadId, conversationId, completedAt)
       VALUES (?, ?, ?)
       ON CONFLICT (threadId, conversationId)
       DO UPDATE SET completedAt = excluded.completedAt
+      WHERE conversation_completions.dismissedAt IS NULL
     `,
-    [threadId, conversationId, (/* @__PURE__ */ new Date()).toISOString()]
-  );
+      [threadId, conversationId, (/* @__PURE__ */ new Date()).toISOString()]
+    );
+  } catch (error2) {
+    log6.error("Failed to mark conversation complete", { error: error2, threadId, conversationId });
+    throw error2;
+  }
 }
 async function unmarkConversationComplete(db, threadId, conversationId) {
-  await db.execute(
-    "DELETE FROM conversation_completions WHERE threadId = ? AND conversationId = ?",
-    [threadId, conversationId]
+  try {
+    await db.execute(
+      `
+      UPDATE conversation_completions
+      SET dismissedAt = ?
+      WHERE threadId = ?
+        AND conversationId = ?
+        AND dismissedAt IS NULL
+    `,
+      [(/* @__PURE__ */ new Date()).toISOString(), threadId, conversationId]
+    );
+  } catch (error2) {
+    log6.error("Failed to dismiss conversation completion", { error: error2, threadId, conversationId });
+    throw error2;
+  }
+}
+async function clearThreadCompletionMarks(db, threadId) {
+  try {
+    await db.execute("DELETE FROM conversation_completions WHERE threadId = ?", [threadId]);
+  } catch (error2) {
+    log6.error("Failed to clear thread completion marks", { error: error2, threadId });
+    throw error2;
+  }
+}
+async function getCompletedConversationIds(db, threadId) {
+  return queryConversationIds(
+    db,
+    threadId,
+    `
+      SELECT conversationId
+      FROM conversation_completions
+      WHERE threadId = ? AND dismissedAt IS NULL
+    `,
+    "Failed to get completed conversation IDs"
   );
 }
+async function getConversationCompletionRows(db, threadId) {
+  try {
+    const result = await db.execute(
+      `
+      SELECT conversationId, dismissedAt
+      FROM conversation_completions
+      WHERE threadId = ?
+    `,
+      [threadId]
+    );
+    const rows = result.rows;
+    return rows.map((row) => ({
+      conversationId: row.conversationId,
+      dismissedAt: row.dismissedAt
+    }));
+  } catch (error2) {
+    log6.error("Failed to get conversation completion rows", { error: error2, threadId });
+    throw error2;
+  }
+}
+async function getMergeableConversationIds(db, threadId) {
+  try {
+    const result = await db.execute(
+      `
+      SELECT mergeable.conversationId
+      FROM (
+        SELECT DISTINCT conversationId
+        FROM conversation_history
+        WHERE threadId = ? AND status = 'active'
+
+        UNION
+
+        SELECT threads.currentConversationId AS conversationId
+        FROM threads
+        WHERE threads.id = ?
+          AND threads.currentConversationId IS NOT NULL
+          AND NOT EXISTS (
+            SELECT 1 FROM conversation_history turns
+            WHERE turns.threadId = threads.id AND turns.status = 'active'
+          )
+      ) mergeable
+      WHERE NOT EXISTS (
+        SELECT 1 FROM conversation_archives archives
+        WHERE archives.threadId = ? AND archives.conversationId = mergeable.conversationId
+      )
+    `,
+      [threadId, threadId, threadId]
+    );
+    const rows = result.rows;
+    return rows.map((row) => row.conversationId);
+  } catch (error2) {
+    log6.error("Failed to get mergeable conversation IDs", { error: error2, threadId });
+    throw error2;
+  }
+}
 async function unmarkConversationRead(db, threadId, conversationId) {
   try {
     await db.execute("DELETE FROM conversation_reads WHERE threadId = ? AND conversationId = ?", [
@@ -39967,11 +40079,11 @@ async function tableColumnNames(db, table) {
   const info = await db.execute(`PRAGMA table_info(${table})`);
   return new Set(info.rows.map((col) => col.name));
 }
-function addColumn(table, column, definition, log160) {
+function addColumn(table, column, definition, log161) {
   return {
     table,
     column,
-    log: log160,
+    log: log161,
     statements: [`ALTER TABLE ${table} ADD COLUMN ${definition}`]
   };
 }
@@ -40377,6 +40489,14 @@ async function migrateProjectTasksSchema(db) {
       column: "modified",
       log: "[db] Running migration: Adding modified column to project_tasks",
       statements: [`ALTER TABLE project_tasks ADD COLUMN modified INTEGER NOT NULL DEFAULT 0`]
+    },
+    {
+      table: "project_tasks",
+      column: "activeRunCount",
+      log: "[db] Running migration: Adding activeRunCount column to project_tasks",
+      statements: [
+        `ALTER TABLE project_tasks ADD COLUMN activeRunCount INTEGER NOT NULL DEFAULT 0`
+      ]
     }
   ]);
   await db.execute(`
@@ -40387,6 +40507,14 @@ async function migrateProjectTasksSchema(db) {
     CREATE INDEX IF NOT EXISTS idx_project_tasks_schedule_recurring
     ON project_tasks(triggerType, scheduleCron)
   `);
+  await db.execute(`
+    CREATE INDEX IF NOT EXISTS idx_project_tasks_threadId
+    ON project_tasks(threadId)
+  `);
+  await db.execute(`
+    CREATE INDEX IF NOT EXISTS idx_project_tasks_event
+    ON project_tasks(projectId, triggerType, eventKey)
+  `);
 }
 async function migrateProjectTagsSchema(db) {
   const projectTagsExists = await db.execute(
@@ -40732,14 +40860,14 @@ async function migrateMcpOAuthSchema(db) {
     `);
   }
 }
-async function createTableIfMissing(db, table, log160, sql) {
+async function createTableIfMissing(db, table, log161, sql) {
   const exists = await db.execute(
     `SELECT name FROM sqlite_master WHERE type='table' AND name='${table}'`
   );
   if (exists.rows.length > 0) {
     return;
   }
-  tarskDebugLog(log160);
+  tarskDebugLog(log161);
   await db.execute(sql);
 }
 async function migrateDailySpendSchema(db) {
@@ -41020,19 +41148,27 @@ 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(`
+  if (exists.rows.length === 0) {
+    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,
+      dismissedAt TEXT,
       PRIMARY KEY (threadId, conversationId),
       FOREIGN KEY (threadId) REFERENCES threads(id) ON DELETE CASCADE
     )
   `);
+  }
+  await ensureColumns(db, [
+    addColumn(
+      "conversation_completions",
+      "dismissedAt",
+      "dismissedAt TEXT",
+      "[db] Running migration: Adding dismissedAt column to conversation_completions"
+    )
+  ]);
 }
 async function migrateCrossProjectLaunches(db) {
   const exists = await db.execute(
@@ -41310,12 +41446,14 @@ var init_database = __esm({
       )
     `,
       // Conversations completed after their pull request merged. A subsequent
-      // user message clears the marker and makes the conversation active again.
+      // user message dismisses the marker (dismissedAt set) and makes the
+      // conversation active again; the merged-PR scanner never resurrects it.
       `
       CREATE TABLE IF NOT EXISTS conversation_completions (
         threadId TEXT NOT NULL,
         conversationId TEXT NOT NULL,
         completedAt TEXT NOT NULL,
+        dismissedAt TEXT,
         PRIMARY KEY (threadId, conversationId),
         FOREIGN KEY (threadId) REFERENCES threads(id) ON DELETE CASCADE
       )
@@ -41422,6 +41560,7 @@ var init_database = __esm({
         lastTriggeredAt TEXT,
         lastRunStatus TEXT,
         modified INTEGER NOT NULL DEFAULT 0,
+        activeRunCount INTEGER NOT NULL DEFAULT 0,
         createdAt TEXT NOT NULL,
         updatedAt TEXT NOT NULL,
         FOREIGN KEY (projectId) REFERENCES projects(id) ON DELETE CASCADE
@@ -41443,6 +41582,16 @@ var init_database = __esm({
     `,
       `
       CREATE INDEX IF NOT EXISTS idx_project_task_runs_task ON project_task_runs(taskId, createdAt DESC)
+    `,
+      // In-flight automation threads. A task can have several at once; working
+      // stays set until the last one finishes. threadId on project_tasks is only
+      // the latest launch, so completion is matched through this table.
+      `
+      CREATE TABLE IF NOT EXISTS project_task_active_runs (
+        threadId TEXT PRIMARY KEY,
+        taskId TEXT NOT NULL,
+        FOREIGN KEY (taskId) REFERENCES project_tasks(id) ON DELETE CASCADE
+      )
     `,
       // Create project task tag tables (ADR 0004)
       `
@@ -41586,6 +41735,15 @@ var init_database = __esm({
     `,
       `
       CREATE INDEX IF NOT EXISTS idx_project_tasks_projectId ON project_tasks(projectId)
+    `,
+      // threadId lookups run on every chat message (getTaskByThreadId) and at
+      // task-run completion (clearWorkingByThreadId): keep them off full scans.
+      `
+      CREATE INDEX IF NOT EXISTS idx_project_tasks_threadId ON project_tasks(threadId)
+    `,
+      // Event-trigger dispatch (getEnabledEventTasksByKey) filters on all three.
+      `
+      CREATE INDEX IF NOT EXISTS idx_project_tasks_event ON project_tasks(projectId, triggerType, eventKey)
     `,
       `
       CREATE INDEX IF NOT EXISTS idx_project_tags_projectId ON project_tags(projectId)
@@ -54324,6 +54482,9 @@ function extractEditMissAnchorTokens(oldText) {
   for (const match3 of oldText.matchAll(/@[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+/g)) {
     add(match3[0]);
   }
+  for (const match3 of oldText.matchAll(/0x[0-9a-fA-F]{3,}/g)) {
+    add(match3[0]);
+  }
   tokens.sort(function(left2, right2) {
     return right2.length - left2.length;
   });
@@ -54369,6 +54530,180 @@ function isWeakClosestLine(content, lineIndex) {
   const line = normalizeToLF(content).split("\n")[lineIndex]?.trim() ?? "";
   return line.length <= 2;
 }
+function isCommonEditMissToken(token) {
+  return EDIT_MISS_COMMON_TOKENS.has(token) || EDIT_MISS_COMMON_TOKENS.has(token.toLowerCase());
+}
+function isSpecificIdentifier(token) {
+  if (token.length < 4 || isCommonEditMissToken(token)) {
+    return false;
+  }
+  if (/[a-z][A-Z]/.test(token)) {
+    return true;
+  }
+  return token.length >= 8;
+}
+function extractSpecificTokens(text) {
+  const tokens = [];
+  const seen = /* @__PURE__ */ new Set();
+  function add(token) {
+    if (token.length < 4 || isCommonEditMissToken(token) || seen.has(token)) {
+      return;
+    }
+    if (!isSpecificIdentifier(token) && !token.startsWith("@") && !token.startsWith("0x") && !/[\s./-]/.test(token)) {
+      return;
+    }
+    seen.add(token);
+    tokens.push(token);
+  }
+  for (const match3 of text.matchAll(/["']([^"']{4,})["']/g)) {
+    add(match3[1] ?? "");
+  }
+  for (const match3 of text.matchAll(/@[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+/g)) {
+    add(match3[0]);
+  }
+  for (const match3 of text.matchAll(/0x[0-9a-fA-F]{3,}/g)) {
+    add(match3[0]);
+  }
+  const outsideQuotes = text.replace(/["'][^"']*["']/g, " ");
+  for (const match3 of outsideQuotes.matchAll(/[A-Za-z_$][\w$]*/g)) {
+    add(match3[0]);
+  }
+  tokens.sort(function(left2, right2) {
+    return right2.length - left2.length;
+  });
+  return tokens;
+}
+function sharesSubstantialPrefix(oldLine, fileLine) {
+  const oldNorm = normalizeForFuzzyMatch(oldLine).trim();
+  const fileNorm = normalizeForFuzzyMatch(fileLine).trim();
+  if (oldNorm.length === 0 || fileNorm.length === 0) {
+    return false;
+  }
+  const prefixLength = commonPrefixLength(oldNorm, fileNorm);
+  const shorter = Math.min(oldNorm.length, fileNorm.length);
+  if (prefixLength === shorter) {
+    return true;
+  }
+  return prefixLength >= 12 && shorter - prefixLength <= 8;
+}
+function lineKeepsDistinctiveTokens(oldLine, fileLine) {
+  const tokens = extractSpecificTokens(oldLine);
+  if (tokens.length === 0) {
+    return sharesSubstantialPrefix(oldLine, fileLine);
+  }
+  for (const token of tokens) {
+    if (!fileLine.includes(token)) {
+      return false;
+    }
+  }
+  return true;
+}
+function commonSuffixLength(left2, right2) {
+  const limit3 = Math.min(left2.length, right2.length);
+  let length = 0;
+  for (let index4 = 0; index4 < limit3; index4++) {
+    if (left2[left2.length - 1 - index4] !== right2[right2.length - 1 - index4]) {
+      break;
+    }
+    length++;
+  }
+  return length;
+}
+function identifiersAreSimilar(left2, right2) {
+  if (left2.toLowerCase() === right2.toLowerCase()) {
+    return true;
+  }
+  if (commonPrefixLength(left2, right2) >= 6) {
+    return true;
+  }
+  return commonSuffixLength(left2, right2) >= 8;
+}
+function extractCallHeads(oldText) {
+  const heads = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const match3 of oldText.matchAll(/([A-Za-z_$][\w$]*)\s*\(/g)) {
+    const head = match3[1] ?? "";
+    if (head.length < 4 || isCommonEditMissToken(head) || seen.has(head)) {
+      continue;
+    }
+    seen.add(head);
+    heads.push(head);
+  }
+  heads.sort(function(left2, right2) {
+    return right2.length - left2.length;
+  });
+  return heads;
+}
+function trimSimilarLine(line) {
+  const trimmed = line.trimEnd();
+  if (trimmed.length <= 160) {
+    return trimmed;
+  }
+  return `${trimmed.slice(0, 157)}...`;
+}
+function findSimilarCallLines(content, oldText) {
+  const heads = extractCallHeads(oldText);
+  const specificIdentifiers = extractSpecificTokens(oldText).filter(function(token) {
+    return /^[A-Za-z_$]/.test(token);
+  });
+  const primary = heads[0] ?? specificIdentifiers[0];
+  if (!primary) {
+    return [];
+  }
+  const fileLines = normalizeToLF(content).split("\n");
+  const exact = [];
+  const similar = [];
+  const primaryLower = primary.toLowerCase();
+  for (let lineIndex = 0; lineIndex < fileLines.length; lineIndex++) {
+    const line = fileLines[lineIndex] ?? "";
+    if (line.trim().length < 4) {
+      continue;
+    }
+    if (line.toLowerCase().includes(primaryLower)) {
+      exact.push({ lineNumber: lineIndex + 1, text: trimSimilarLine(line) });
+      if (exact.length >= EDIT_MISS_SIMILAR_LINE_LIMIT) {
+        break;
+      }
+      continue;
+    }
+    if (exact.length > 0) {
+      continue;
+    }
+    const identifiers = line.match(/[A-Za-z_$][\w$]{3,}/g) ?? [];
+    const matched = identifiers.some(function(identifier) {
+      return identifiersAreSimilar(identifier, primary);
+    });
+    if (matched && similar.length < EDIT_MISS_SIMILAR_LINE_LIMIT) {
+      similar.push({ lineNumber: lineIndex + 1, text: trimSimilarLine(line) });
+    }
+  }
+  return exact.length > 0 ? exact : similar;
+}
+function formatAbsentTokenHint(content, oldText) {
+  const intro = "No line in the file matches the start of oldText. oldText may be stale, minified, or use different quoting/spacing than the file \u2014 correct it from a unique nearby substring (or editMany retryHints/currentSnippet); do not invent compact JSON.";
+  const missing = extractSpecificTokens(oldText).filter(function(token) {
+    return !content.includes(token);
+  }).slice(0, 6);
+  const similar = findSimilarCallLines(content, oldText);
+  const parts = [intro];
+  if (missing.length > 0) {
+    const listed = missing.map(function(token) {
+      return JSON.stringify(token);
+    }).join(", ");
+    parts.push(`Not in this file: ${listed}.`);
+  }
+  if (similar.length > 0) {
+    const lines = similar.map(function(entry) {
+      return `  ${entry.lineNumber}| ${entry.text}`;
+    }).join("\n");
+    parts.push(
+      "Similar lines (read the file and copy the real text; these lines are not oldText):\n" + lines
+    );
+  } else {
+    parts.push("Read the file and copy the real text. Do not retry this oldText.");
+  }
+  return parts.join("\n");
+}
 function describeFormattingDrift(oldText, fileLine) {
   const compactFile = collapseWhitespace(fileLine);
   const oldLines = normalizeToLF(oldText).split("\n").map(function(line) {
@@ -54484,14 +54819,26 @@ ${slice.join("\n")}
 function formatEditMissHint(content, oldText) {
   const closestLine = findClosestLineForOldText(content, oldText);
   const tokenAnchor = findTokenAnchorLine(content, oldText);
+  const fileLinesForGate = normalizeToLF(content).split("\n");
+  const firstOldLine = splitLines2(normalizeToLF(oldText)).find(function(line) {
+    return line.trim().length > 0;
+  }) ?? "";
   let lineIndex = closestLine;
   let viaToken;
-  if (tokenAnchor && (closestLine === void 0 || isWeakClosestLine(content, closestLine))) {
-    lineIndex = tokenAnchor.lineIndex;
-    viaToken = tokenAnchor.token;
+  const closestUsable = closestLine !== void 0 && !isWeakClosestLine(content, closestLine) && lineKeepsDistinctiveTokens(firstOldLine, fileLinesForGate[closestLine] ?? "");
+  if (!closestUsable && tokenAnchor) {
+    const anchorLine = fileLinesForGate[tokenAnchor.lineIndex] ?? "";
+    if (!isWeakClosestLine(content, tokenAnchor.lineIndex) && anchorLine.includes(tokenAnchor.token)) {
+      lineIndex = tokenAnchor.lineIndex;
+      viaToken = tokenAnchor.token;
+    } else {
+      lineIndex = void 0;
+    }
+  } else if (!closestUsable) {
+    lineIndex = void 0;
   }
   if (lineIndex === void 0 || isWeakClosestLine(content, lineIndex) && viaToken === void 0) {
-    return "No line in the file matches the start of oldText. oldText may be stale, minified, or use different quoting/spacing than the file \u2014 correct it from a unique nearby substring (or editMany retryHints/currentSnippet); do not invent compact JSON and do not start a new read turn.";
+    return formatAbsentTokenHint(content, oldText);
   }
   const fileLines = normalizeToLF(content).split("\n");
   const oldLines = splitLines2(normalizeToLF(oldText));
@@ -54631,7 +54978,7 @@ function mergeLineRanges(ranges) {
   }
   return merged;
 }
-var EDIT_MISS_COMMON_TOKENS, EDIT_MISS_HINT_MAX_LINES, EDIT_MISS_HINT_PREFIX_LINES;
+var EDIT_MISS_COMMON_TOKENS, EDIT_MISS_SIMILAR_LINE_LIMIT, EDIT_MISS_HINT_MAX_LINES, EDIT_MISS_HINT_PREFIX_LINES;
 var init_edit_diff = __esm({
   "src/tools/edit-diff.ts"() {
     "use strict";
@@ -54652,8 +54999,33 @@ var init_edit_diff = __esm({
       "return",
       "true",
       "false",
-      "null"
+      "null",
+      "new",
+      "this",
+      "let",
+      "var",
+      "from",
+      "class",
+      "string",
+      "boolean",
+      "number",
+      "void",
+      "public",
+      "static",
+      "async",
+      "await",
+      "undefined",
+      "object",
+      "default",
+      "color",
+      "side",
+      "roughness",
+      "opacity",
+      "transparent",
+      "metalness",
+      "emissive"
     ]);
+    EDIT_MISS_SIMILAR_LINE_LIMIT = 4;
     EDIT_MISS_HINT_MAX_LINES = 40;
     EDIT_MISS_HINT_PREFIX_LINES = 2;
   }
@@ -92919,12 +93291,12 @@ var init_poller = __esm({
           throw new AnthropicError("Cannot iterate over a consumed WorkPoller");
         }
         __classPrivateFieldSet2(this, _WorkPoller_consumed, true, "f");
-        const log160 = loggerFor2(this.client);
-        log160.info("poller starting", {
+        const log161 = loggerFor2(this.client);
+        log161.info("poller starting", {
           component: "work-poller",
           environment_id: this.environmentId
         });
-        const idle = new IdleLog(log160, this.environmentId);
+        const idle = new IdleLog(log161, this.environmentId);
         try {
           let attempt = 0;
           while (!__classPrivateFieldGet3(this, _WorkPoller_controller, "f").signal.aborted) {
@@ -92939,11 +93311,11 @@ var init_poller = __esm({
               if (__classPrivateFieldGet3(this, _WorkPoller_controller, "f").signal.aborted)
                 return;
               if (isFatal4xx(e2)) {
-                log160.error("poll failed permanently, stopping poller", { error: String(e2) });
+                log161.error("poll failed permanently, stopping poller", { error: String(e2) });
                 throw e2;
               }
               const wait = applyJitter(backoff2(attempt));
-              log160.warn("poll failed, backing off", { error: String(e2), backoff_ms: wait });
+              log161.warn("poll failed, backing off", { error: String(e2), backoff_ms: wait });
               attempt++;
               await sleep2(wait, __classPrivateFieldGet3(this, _WorkPoller_controller, "f").signal);
               continue;
@@ -92957,7 +93329,7 @@ var init_poller = __esm({
               continue;
             }
             idle.onClaim();
-            log160.info("claimed work", {
+            log161.info("claimed work", {
               component: "work-poller",
               environment_id: this.environmentId,
               work_id: work.id,
@@ -92966,7 +93338,7 @@ var init_poller = __esm({
             try {
               await __classPrivateFieldGet3(this, _WorkPoller_runnerClient, "f").beta.environments.work.ack(work.id, { environment_id: work.environment_id }, { headers: buildHeaders2([__classPrivateFieldGet3(this, _WorkPoller_requestOpts, "f")?.headers]), signal: __classPrivateFieldGet3(this, _WorkPoller_controller, "f").signal });
             } catch (e2) {
-              log160.error("ack failed", { work_id: work.id, error: String(e2) });
+              log161.error("ack failed", { work_id: work.id, error: String(e2) });
               continue;
             }
             try {
@@ -92977,7 +93349,7 @@ var init_poller = __esm({
                   await __classPrivateFieldGet3(this, _WorkPoller_runnerClient, "f").beta.environments.work.stop(work.id, { environment_id: work.environment_id }, { headers: buildHeaders2([__classPrivateFieldGet3(this, _WorkPoller_requestOpts, "f")?.headers]) });
                 } catch (e2) {
                   if (!isStatus(e2, 409))
-                    log160.warn("stop failed", { work_id: work.id, error: String(e2) });
+                    log161.warn("stop failed", { work_id: work.id, error: String(e2) });
                 }
               }
             }
@@ -92988,12 +93360,12 @@ var init_poller = __esm({
       }
     };
     IdleLog = class {
-      constructor(log160, environmentId) {
+      constructor(log161, environmentId) {
         _IdleLog_log.set(this, void 0);
         _IdleLog_environmentId.set(this, void 0);
         _IdleLog_idleSince.set(this, void 0);
         _IdleLog_lastReport.set(this, 0);
-        __classPrivateFieldSet2(this, _IdleLog_log, log160, "f");
+        __classPrivateFieldSet2(this, _IdleLog_log, log161, "f");
         __classPrivateFieldSet2(this, _IdleLog_environmentId, environmentId, "f");
       }
       onEmptyPoll() {
@@ -93849,13 +94221,13 @@ async function setupSkills(ctx) {
   if (!client)
     return async () => {
     };
-  const log160 = loggerFor2(client);
+  const log161 = loggerFor2(client);
   let session = ctx.session;
   if (!session) {
     if (sessionId === void 0)
       return async () => {
       };
-    log160.warn("AgentToolContext.sessionId is deprecated and costs an extra session fetch; fetch the session once and set `session` instead", { component: "agent-tool-context" });
+    log161.warn("AgentToolContext.sessionId is deprecated and costs an extra session fetch; fetch the session once and set `session` instead", { component: "agent-tool-context" });
     session = await client.beta.sessions.retrieve(sessionId);
   }
   const skillsRoot = path6.resolve(ctx.workdir, "skills");
@@ -93868,7 +94240,7 @@ async function setupSkills(ctx) {
         dirname27 = skill.skill_id;
       const dest = path6.resolve(skillsRoot, dirname27);
       if (dest !== skillsRoot && !dest.startsWith(skillsRoot + path6.sep)) {
-        log160.warn("skill name escapes the skills dir; skipping", {
+        log161.warn("skill name escapes the skills dir; skipping", {
           component: "agent-tool-context",
           name: version3.name
         });
@@ -93879,14 +94251,14 @@ async function setupSkills(ctx) {
       await fs10.mkdir(dest, { recursive: true, mode: DIR_CREATE_MODE });
       created.push(dest);
       await extractSkillArchive(resp, dest);
-      log160.info("downloaded skill", {
+      log161.info("downloaded skill", {
         component: "agent-tool-context",
         skill_id: skill.skill_id,
         version: version3.id,
         dest
       });
     } catch (e2) {
-      log160.warn("failed to download skill", {
+      log161.warn("failed to download skill", {
         component: "agent-tool-context",
         skill_id: skill.skill_id,
         error: String(e2)
@@ -93896,7 +94268,7 @@ async function setupSkills(ctx) {
   return async () => {
     for (const dest of created) {
       await fs10.rm(dest, { recursive: true, force: true }).catch((e2) => {
-        log160.warn("failed to clean up skill", { component: "agent-tool-context", dest, error: String(e2) });
+        log161.warn("failed to clean up skill", { component: "agent-tool-context", dest, error: String(e2) });
       });
     }
   };
@@ -95942,7 +96314,7 @@ async function withTimeout(p, ms2) {
       clearTimeout(timer2);
   }
 }
-async function forceStop(client, work, log160, requestOptions) {
+async function forceStop(client, work, log161, requestOptions) {
   try {
     await client.beta.environments.work.stop(
       work.id,
@@ -95954,7 +96326,7 @@ async function forceStop(client, work, log160, requestOptions) {
     );
   } catch (e2) {
     if (!isStatus(e2, 409)) {
-      log160.error("force-stop on exit failed", { work_id: work.id, error: String(e2) });
+      log161.error("force-stop on exit failed", { work_id: work.id, error: String(e2) });
     }
   }
 }
@@ -96179,10 +96551,10 @@ var init_worker = __esm({
      * `environmentKey` unchanged.
      */
     async function _EnvironmentWorker_handleItem2(work, environmentKey, externalSignal) {
-      const log160 = loggerFor2(this.client);
+      const log161 = loggerFor2(this.client);
       const sessionsToken = sessionsTokenFromSecret(work.secret);
       if (work.secret && sessionsToken === null) {
-        log160.warn("work item carried a secret payload but no sessions token could be extracted; falling back to the environment key", { work_id: work.id });
+        log161.warn("work item carried a secret payload but no sessions token could be extracted; falling back to the environment key", { work_id: work.id });
       }
       const itemCredential = sessionsToken ?? environmentKey;
       const sessionClient = copyClientForHelper(this.client, {
@@ -96196,12 +96568,12 @@ var init_worker = __esm({
       const agentToolset = await Promise.resolve().then(() => (init_node6(), node_exports2));
       let leaseTtlMs;
       let runner;
-      const heartbeatPromise = heartbeatLoop(sessionClient, work, lease, log160, this.requestOptions, (ttlMs) => {
+      const heartbeatPromise = heartbeatLoop(sessionClient, work, lease, log161, this.requestOptions, (ttlMs) => {
         leaseTtlMs = ttlMs;
         runner?._setSendRetryWindow(ttlMs);
       }).catch((e2) => {
         if (!ctrl.signal.aborted)
-          log160.error("heartbeat loop failed", { work_id: work.id, error: String(e2) });
+          log161.error("heartbeat loop failed", { work_id: work.id, error: String(e2) });
         ctrl.abort();
       });
       let cleanupSkills = async () => {
@@ -96210,7 +96582,7 @@ var init_worker = __esm({
       let cleanEnd = false;
       try {
         if (work.data.type !== "session") {
-          log160.debug("skipping non-session work item", { work_id: work.id, type: work.data.type });
+          log161.debug("skipping non-session work item", { work_id: work.id, type: work.data.type });
           return;
         }
         const session = await sessionClient.beta.sessions.retrieve(sessionId);
@@ -96229,7 +96601,7 @@ var init_worker = __esm({
         try {
           cleanupSkills = await agentToolset.setupSkills(ctx);
         } catch (e2) {
-          log160.warn("skill setup failed", { session_id: sessionId, work_id: work.id, error: String(e2) });
+          log161.warn("skill setup failed", { session_id: sessionId, work_id: work.id, error: String(e2) });
         }
         if (sessionsToken !== null && this.memorySyncIntervalMs !== null) {
           stores = new agentToolset.SessionMemoryStores(sessionClient, {
@@ -96241,7 +96613,7 @@ var init_worker = __esm({
           ctx.allowedRoots = stores.roots;
           ctx.readOnlyRoots = stores.readOnlyRoots;
         } else {
-          log160.debug("memory stores disabled for this item", { work_id: work.id });
+          log161.debug("memory stores disabled for this item", { work_id: work.id });
         }
         const tools = typeof this.tools === "function" ? this.tools(ctx) : this.tools ?? agentToolset.betaAgentToolset20260401(ctx);
         runner = new SessionToolRunner(sessionId, {
@@ -96261,7 +96633,7 @@ var init_worker = __esm({
       } finally {
         try {
           await cleanupSkills().catch((e2) => {
-            log160.warn("skill cleanup failed", { session_id: sessionId, work_id: work.id, error: String(e2) });
+            log161.warn("skill cleanup failed", { session_id: sessionId, work_id: work.id, error: String(e2) });
           });
         } finally {
           if (stores) {
@@ -96269,17 +96641,17 @@ var init_worker = __esm({
             if (cleanEnd) {
               const finishCutOff = await withTimeout(stores.finish(), boundMs);
               if (finishCutOff) {
-                log160.warn(`final memory sync cut off after ${boundMs}ms; the flush that follows still uploads changed files`, { session_id: sessionId, work_id: work.id });
+                log161.warn(`final memory sync cut off after ${boundMs}ms; the flush that follows still uploads changed files`, { session_id: sessionId, work_id: work.id });
               }
             }
             const flushBound = new AbortController();
             const flushCutOff = await withTimeout(stores.flushWrites(flushBound.signal), boundMs);
             if (flushCutOff) {
               flushBound.abort();
-              log160.warn(`memory flush cut off after ${boundMs}ms; changed files it had not uploaded yet are not saved`, { session_id: sessionId, work_id: work.id });
+              log161.warn(`memory flush cut off after ${boundMs}ms; changed files it had not uploaded yet are not saved`, { session_id: sessionId, work_id: work.id });
             }
             await stores.dispose().catch((e2) => {
-              log160.warn("memory store cleanup failed", {
+              log161.warn("memory store cleanup failed", {
                 session_id: sessionId,
                 work_id: work.id,
                 error: String(e2)
@@ -96291,9 +96663,9 @@ var init_worker = __esm({
         detachExternal();
         await heartbeatPromise;
         if (lease.lost) {
-          log160.info("lease lost; released without stopping it", { session_id: sessionId, work_id: work.id });
+          log161.info("lease lost; released without stopping it", { session_id: sessionId, work_id: work.id });
         } else {
-          await forceStop(sessionClient, work, log160, this.requestOptions);
+          await forceStop(sessionClient, work, log161, this.requestOptions);
         }
       }
     };
@@ -108830,7 +109202,7 @@ var require_node = __commonJS({
     var tty = __require("tty");
     var util3 = __require("util");
     exports2.init = init;
-    exports2.log = log160;
+    exports2.log = log161;
     exports2.formatArgs = formatArgs;
     exports2.save = save;
     exports2.load = load;
@@ -108965,7 +109337,7 @@ var require_node = __commonJS({
       }
       return (/* @__PURE__ */ new Date()).toISOString() + " ";
     }
-    function log160(...args2) {
+    function log161(...args2) {
       return process.stderr.write(util3.formatWithOptions(exports2.inspectOpts, ...args2) + "\n");
     }
     function save(namespaces) {
@@ -118404,7 +118776,7 @@ var require_logging_utils = __commonJS({
     exports2.getDebugBackend = getDebugBackend;
     exports2.getStructuredBackend = getStructuredBackend;
     exports2.setBackend = setBackend;
-    exports2.log = log160;
+    exports2.log = log161;
     var events_1 = __require("events");
     var process12 = __importStar2(__require("process"));
     var util3 = __importStar2(__require("util"));
@@ -118436,7 +118808,7 @@ var require_logging_utils = __commonJS({
         this.func.info = (...args2) => this.invokeSeverity(LogSeverity.INFO, ...args2);
         this.func.warn = (...args2) => this.invokeSeverity(LogSeverity.WARNING, ...args2);
         this.func.error = (...args2) => this.invokeSeverity(LogSeverity.ERROR, ...args2);
-        this.func.sublog = (namespace2) => log160(namespace2, this.func);
+        this.func.sublog = (namespace2) => log161(namespace2, this.func);
       }
       invoke(fields, ...args2) {
         if (this.upstream) {
@@ -118603,7 +118975,7 @@ var require_logging_utils = __commonJS({
       cachedBackend = backend;
       loggerCache.clear();
     }
-    function log160(namespace, parent) {
+    function log161(namespace, parent) {
       if (!cachedBackend) {
         const enablesFlag = process12.env[exports2.env.nodeEnables];
         if (!enablesFlag) {
@@ -118736,7 +119108,7 @@ var require_src4 = __commonJS({
     exports2.HEADER_NAME = "Metadata-Flavor";
     exports2.HEADER_VALUE = "Google";
     exports2.HEADERS = Object.freeze({ [exports2.HEADER_NAME]: exports2.HEADER_VALUE });
-    var log160 = logger.log("gcp-metadata");
+    var log161 = logger.log("gcp-metadata");
     exports2.METADATA_SERVER_DETECTION = Object.freeze({
       "assume-present": "don't try to ping the metadata server, but assume it's present",
       none: "don't try to ping the metadata server, but don't try to use it either",
@@ -118799,9 +119171,9 @@ var require_src4 = __commonJS({
         responseType: "text",
         timeout: requestTimeout()
       };
-      log160.info("instance request %j", req);
+      log161.info("instance request %j", req);
       const res = await requestMethod(req);
-      log160.info("instance metadata is %s", res.data);
+      log161.info("instance metadata is %s", res.data);
       const metadataFlavor = res.headers.get(exports2.HEADER_NAME);
       if (metadataFlavor !== exports2.HEADER_VALUE) {
         throw new RangeError(`Invalid response from metadata service: incorrect ${exports2.HEADER_NAME} header. Expected '${exports2.HEADER_VALUE}', got ${metadataFlavor ? `'${metadataFlavor}'` : "no header"}`);
@@ -156581,7 +156953,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "tarsk",
-      version: "0.5.82",
+      version: "0.5.83",
       description: "CLI for Tarsk - Project Threads Manager",
       keywords: [
         "cli",
@@ -158714,17 +159086,64 @@ async function getTaskByThreadId(db, threadId) {
   });
   return result.rows[0] ?? null;
 }
+async function decrementActiveRunCount(db, taskId) {
+  await db.execute({
+    sql: `UPDATE project_tasks
+          SET activeRunCount = MAX(activeRunCount - 1, 0),
+              working = CASE WHEN activeRunCount - 1 > 0 THEN 1 ELSE 0 END,
+              updatedAt = ?
+          WHERE id = ? AND activeRunCount > 0`,
+    args: [(/* @__PURE__ */ new Date()).toISOString(), taskId]
+  });
+}
+async function registerActiveTaskRun(db, taskId, threadId) {
+  await db.execute({
+    sql: `INSERT INTO project_task_active_runs (threadId, taskId) VALUES (?, ?)`,
+    args: [threadId, taskId]
+  });
+}
+async function releaseAutomatedRun(db, taskId, threadId) {
+  if (threadId) {
+    const active = await db.execute({
+      sql: `SELECT taskId FROM project_task_active_runs WHERE threadId = ?`,
+      args: [threadId]
+    });
+    if (active.rows.length > 0) {
+      await clearWorkingByThreadId(db, threadId);
+      return;
+    }
+  }
+  await decrementActiveRunCount(db, taskId);
+}
 async function clearWorkingByThreadId(db, threadId) {
+  const active = await db.execute({
+    sql: `SELECT taskId FROM project_task_active_runs WHERE threadId = ?`,
+    args: [threadId]
+  });
+  const taskId = active.rows[0] ? String(active.rows[0].taskId) : null;
+  if (taskId) {
+    await db.execute({
+      sql: `DELETE FROM project_task_active_runs WHERE threadId = ?`,
+      args: [threadId]
+    });
+    await decrementActiveRunCount(db, taskId);
+    return;
+  }
   await db.execute({
-    sql: `UPDATE project_tasks SET working = 0, updatedAt = ? WHERE threadId = ?`,
+    sql: `UPDATE project_tasks
+          SET working = 0, updatedAt = ?
+          WHERE threadId = ? AND activeRunCount = 0`,
     args: [(/* @__PURE__ */ new Date()).toISOString(), threadId]
   });
 }
 async function clearAllWorkingFlags(db) {
   const result = await db.execute({
-    sql: `UPDATE project_tasks SET working = 0, updatedAt = ? WHERE working = 1`,
+    sql: `UPDATE project_tasks
+          SET working = 0, activeRunCount = 0, updatedAt = ?
+          WHERE working = 1 OR activeRunCount > 0`,
     args: [(/* @__PURE__ */ new Date()).toISOString()]
   });
+  await db.execute(`DELETE FROM project_task_active_runs`);
   return result.rowsAffected ?? 0;
 }
 async function claimTaskForAutomatedRun(db, taskId, options2) {
@@ -158733,19 +159152,26 @@ async function claimTaskForAutomatedRun(db, taskId, options2) {
     sql: `UPDATE project_tasks
           SET status = ?,
               working = 1,
+              activeRunCount = activeRunCount + 1,
               lastTriggeredAt = ?,
               lastRunStatus = NULL,
               triggerType = CASE WHEN ? = 1 AND scheduledAt IS NOT NULL THEN NULL ELSE triggerType END,
               scheduledAt = CASE WHEN ? = 1 AND scheduledAt IS NOT NULL THEN NULL ELSE scheduledAt END,
               updatedAt = ?
-          WHERE id = ? AND working = 0 AND ${enabledClause}`,
+          WHERE id = ?
+            AND ${enabledClause}
+            AND (? = 0 OR scheduledAt IS NOT NULL)
+            AND (? = 0 OR lastTriggeredAt IS ?)`,
     args: [
       options2.status ?? "Build",
       options2.lastTriggeredAt,
       options2.clearSchedule ? 1 : 0,
       options2.clearSchedule ? 1 : 0,
       (/* @__PURE__ */ new Date()).toISOString(),
-      taskId
+      taskId,
+      options2.requirePendingSchedule ? 1 : 0,
+      options2.matchLastTriggeredAt ? 1 : 0,
+      options2.expectedLastTriggeredAt ?? null
     ]
   });
   if ((result.rowsAffected ?? 0) === 0) {
@@ -158761,7 +159187,6 @@ async function getDueOneShotScheduleTasks(db, now) {
             AND scheduledAt IS NOT NULL
             AND scheduledAt <= ?
             AND enabled = 1
-            AND working = 0
           ORDER BY scheduledAt ASC`,
     args: [now]
   });
@@ -158774,7 +159199,6 @@ async function getRecurringScheduleTasks(db) {
           WHERE triggerType = 'schedule'
             AND scheduleCron IS NOT NULL
             AND enabled = 1
-            AND working = 0
           ORDER BY createdAt ASC`,
     args: []
   });
@@ -178664,11 +179088,11 @@ var require_core = __commonJS({
     Ajv2.ValidationError = validation_error_1.default;
     Ajv2.MissingRefError = ref_error_1.default;
     exports2.default = Ajv2;
-    function checkOptions(checkOpts, options2, msg, log160 = "error") {
+    function checkOptions(checkOpts, options2, msg, log161 = "error") {
       for (const key in checkOpts) {
         const opt = key;
         if (opt in options2)
-          this.logger[log160](`${msg}: option ${key}. ${checkOpts[opt]}`);
+          this.logger[log161](`${msg}: option ${key}. ${checkOpts[opt]}`);
       }
     }
     function getSchEnv(keyRef) {
@@ -217823,7 +218247,7 @@ var require_merge = __commonJS({
 var require_addPairToJSMap = __commonJS({
   "../node_modules/.bun/yaml@2.9.0/node_modules/yaml/dist/nodes/addPairToJSMap.js"(exports2) {
     "use strict";
-    var log160 = require_log();
+    var log161 = require_log();
     var merge3 = require_merge();
     var stringify4 = require_stringify2();
     var identity2 = require_identity();
@@ -217872,7 +218296,7 @@ var require_addPairToJSMap = __commonJS({
           let jsonStr = JSON.stringify(strKey);
           if (jsonStr.length > 40)
             jsonStr = jsonStr.substring(0, 36) + '..."';
-          log160.warn(ctx.doc.options.logLevel, `Keys with collection values will be stringified due to JS Object restrictions: ${jsonStr}. Set mapAsMap: true to use object keys.`);
+          log161.warn(ctx.doc.options.logLevel, `Keys with collection values will be stringified due to JS Object restrictions: ${jsonStr}. Set mapAsMap: true to use object keys.`);
           ctx.mapKeyWarned = true;
         }
         return strKey;
@@ -223288,7 +223712,7 @@ var require_public_api2 = __commonJS({
     var composer = require_composer();
     var Document2 = require_Document();
     var errors = require_errors2();
-    var log160 = require_log();
+    var log161 = require_log();
     var identity2 = require_identity();
     var lineCounter = require_line_counter();
     var parser2 = require_parser();
@@ -223340,7 +223764,7 @@ var require_public_api2 = __commonJS({
       const doc = parseDocument(src, options2);
       if (!doc)
         return null;
-      doc.warnings.forEach((warning) => log160.warn(doc.options.logLevel, warning));
+      doc.warnings.forEach((warning) => log161.warn(doc.options.logLevel, warning));
       if (doc.errors.length > 0) {
         if (doc.options.logLevel !== "silent")
           throw doc.errors[0];
@@ -229895,10 +230319,13 @@ function estimateTurnCacheCost(previousWire, currentWire) {
     effectiveTokens: cacheReadTokens * CACHE_RATES.read + cacheWriteTokens * CACHE_RATES.writeLong
   };
 }
-function isMicrocompactRewriteCheaperThanKeep(previousWire, uncompacted, compacted) {
+function isMicrocompactRewriteCheaperThanKeep(previousWire, uncompacted, compacted, observedHitRate) {
   if (!previousWire || previousWire.length === 0) {
     return true;
   }
+  if (observedHitRate !== void 0 && !isPromptCacheUnavailable(observedHitRate) && countLeadingIdenticalMessages(previousWire, compacted) < previousWire.length) {
+    return false;
+  }
   const keep = estimateTurnCacheCost(previousWire, uncompacted);
   const rewrite = estimateTurnCacheCost(previousWire, compacted);
   return rewrite.effectiveTokens <= keep.effectiveTokens;
@@ -229907,6 +230334,7 @@ var CACHE_RATES;
 var init_microcompact_cache_economics = __esm({
   "src/features/microcompact/microcompact-cache-economics.ts"() {
     "use strict";
+    init_dist();
     init_microcompact_tokens();
     CACHE_RATES = {
       read: 0.1,
@@ -230329,6 +230757,10 @@ function pruneSupersededToolResults(messages, options2 = {}) {
       stats.cacheDeferredCount += 1;
       continue;
     }
+    if (options2.cachedPrefixLength !== void 0 && sourceIndex < options2.cachedPrefixLength) {
+      stats.cacheDeferredCount += 1;
+      continue;
+    }
     const marker = supersessionMarker(target.message.toolCallId);
     const replacement = replacementMessage(source2.message, marker);
     if (replacement.tokensSaved <= 0) {
@@ -230392,6 +230824,19 @@ function findLastUserMessageIndex(messages) {
 function resolveCacheHitRate(options2) {
   return options2.cacheHitRateFn ? options2.cacheHitRateFn() : options2.cacheHitRate;
 }
+function sessionIsReadingPromptCache(cacheHitRate) {
+  return cacheHitRate !== void 0 && !isPromptCacheUnavailable(cacheHitRate);
+}
+function isCachedPrefixIndex(options2, index4) {
+  if (options2.overflowRecovery === true) {
+    return false;
+  }
+  if (!sessionIsReadingPromptCache(resolveCacheHitRate(options2))) {
+    return false;
+  }
+  const prefixLength = options2.previousWire?.length ?? 0;
+  return prefixLength > 0 && index4 < prefixLength;
+}
 function isFrozenToolCallId(frozenToolCallIds, toolCallId) {
   return frozenToolCallIds?.has(toolCallId) === true;
 }
@@ -230793,12 +231238,7 @@ function computeMicrocompactTriggerState(messages, options2, config3) {
   const tokensBefore = sumMessageTokens(messages) + config3.fixedOverheadTokens;
   const overflowRecovery = options2.overflowRecovery === true;
   const noCache = isPromptCacheUnavailable(cacheHitRate);
-  const nearWindowCeiling = isNearWindowCeilingTrigger(
-    messages,
-    options2,
-    config3,
-    cacheHitRate
-  );
+  const nearWindowCeiling = isNearWindowCeilingTrigger(messages, options2, config3, cacheHitRate);
   const proactiveTrigger = isProactiveMicrocompactTrigger(messages, options2);
   const cacheReclaim = isCacheReclaimTrigger(messages, config3, cacheHitRate);
   const frozenToolCallIds = overflowRecovery || noCache ? void 0 : cacheReclaim ? unprotectOldestFrozenIds(
@@ -230909,13 +231349,18 @@ function buildClearedStats(emptyStats2, eligibleCount, keptCount, clearedCount,
     applied: clearedCount > 0
   };
 }
-function logAppliedCompaction(stats, cacheProtectedMessageCount, cacheProtectedTokens) {
+function cacheRewriteAvoided(previousWireLength, clearCandidates) {
+  return previousWireLength > 0 && clearCandidates.every(function isPastCachedPrefix(index4) {
+    return index4 >= previousWireLength;
+  });
+}
+function logAppliedCompaction(stats, cacheProtectedMessageCount, cacheProtectedTokens, clearCandidates, previousWireLength) {
   if (stats.applied) {
     log54.info("Applied micro-compaction", {
       ...stats,
       cacheProtectedMessageCount,
       cacheProtectedTokens,
-      cacheRewriteAvoided: cacheProtectedMessageCount > 0
+      cacheRewriteAvoided: cacheRewriteAvoided(previousWireLength, clearCandidates)
     });
   }
 }
@@ -230963,7 +231408,12 @@ function shouldSkipPrefixRewriteForCacheEconomics(trigger, options2, messages, c
     return false;
   }
   const projected = projectClearedMessages(messages, clearCandidates);
-  return !isMicrocompactRewriteCheaperThanKeep(previousWire, messages, projected);
+  return !isMicrocompactRewriteCheaperThanKeep(
+    previousWire,
+    messages,
+    projected,
+    trigger.cacheHitRate
+  );
 }
 function isUnprotectedFrozenCandidate(trigger, options2, messages, index4) {
   if (!trigger.nearWindowCeiling && !trigger.cacheReclaim) {
@@ -230978,11 +231428,25 @@ function isUnprotectedFrozenCandidate(trigger, options2, messages, index4) {
   }
   return !isFrozenToolCallId(trigger.frozenToolCallIds, message.toolCallId);
 }
+function clearCandidatesOutsideCachedPrefix(clearCandidates, prefixLength) {
+  if (prefixLength <= 0) {
+    return clearCandidates;
+  }
+  return clearCandidates.filter(function isOutsideCachedPrefix(index4) {
+    return index4 >= prefixLength;
+  });
+}
 function selectCacheEconomicClearCandidates(trigger, options2, messages, clearCandidates) {
-  if (!shouldSkipPrefixRewriteForCacheEconomics(trigger, options2, messages, clearCandidates)) {
+  if (trigger.noCache || options2.overflowRecovery === true) {
     return clearCandidates;
   }
   const prefixLength = options2.previousWire?.length ?? 0;
+  if (sessionIsReadingPromptCache(trigger.cacheHitRate) && prefixLength > 0) {
+    return clearCandidatesOutsideCachedPrefix(clearCandidates, prefixLength);
+  }
+  if (!shouldSkipPrefixRewriteForCacheEconomics(trigger, options2, messages, clearCandidates)) {
+    return clearCandidates;
+  }
   return clearCandidates.filter(function isAllowedRewrite(index4) {
     return index4 >= prefixLength || isUnprotectedFrozenCandidate(trigger, options2, messages, index4);
   });
@@ -231005,7 +231469,13 @@ async function applyMicrocompactClearance(params) {
     params.tokensBefore,
     tokensAfter
   );
-  logAppliedCompaction(stats, params.cacheProtectedMessageCount, params.cacheProtectedTokens);
+  logAppliedCompaction(
+    stats,
+    params.cacheProtectedMessageCount,
+    params.cacheProtectedTokens,
+    params.clearCandidates,
+    params.options.previousWire?.length ?? 0
+  );
   return { messages: next, stats };
 }
 async function microcompactMessages(messages, options2 = {}) {
@@ -231132,6 +231602,9 @@ async function prunePriorTurnToolResults(messages, options2 = {}) {
   let clearedCount = 0;
   let eligibleCount = 0;
   for (let index4 = 0; index4 < lastUserIndex; index4++) {
+    if (isCachedPrefixIndex(options2, index4)) {
+      continue;
+    }
     const candidate = prunablePriorTurnMessage(messages[index4], digestMinChars, frozenToolCallIds);
     if (candidate === null) {
       continue;
@@ -231204,13 +231677,15 @@ function createMicrocompactTransformContext(options2) {
   async function transformContext(messages) {
     const cacheHitRate = resolveCacheHitRate(options2);
     const { protectPrefix, view } = prepareFrozenTransform(options2, messages, cacheHitRate);
+    const previousWire = protectPrefix ? getFrozenPrefixMessages(options2.sessionKey) : void 0;
     const runOptions = {
       ...options2,
       memo,
       frozenToolCallIds: resolveFrozenToolCallIds(protectPrefix, options2),
       cacheHitRate,
       cacheHitRateFn: void 0,
-      previousWire: protectPrefix ? getFrozenPrefixMessages(options2.sessionKey) : void 0
+      previousWire,
+      cachedPrefixLength: sessionIsReadingPromptCache(cacheHitRate) && previousWire ? previousWire.length : void 0
     };
     try {
       const deduped = deduplicateIdenticalTodoResults(view);
@@ -231499,9 +231974,9 @@ function extractToolResultText(result) {
   }
   return content.filter((block) => block.type === "text").map((block) => block.text ?? "").join("");
 }
-function logToolCallFailed(log160, event, pending2) {
+function logToolCallFailed(log161, event, pending2) {
   const errorMessage4 = extractToolResultText(event.result).trim() || "Unknown tool error";
-  log160.warn("Tool call failed", {
+  log161.warn("Tool call failed", {
     toolName: event.toolName,
     toolCallId: event.toolCallId,
     arguments: serializeArgumentsForLog(pending2?.args),
@@ -231509,7 +231984,7 @@ function logToolCallFailed(log160, event, pending2) {
   });
 }
 function createAgentEventLogger(event) {
-  const log160 = createLogger(event);
+  const log161 = createLogger(event);
   const pendingToolCalls = /* @__PURE__ */ new Map();
   let sequence2 = 0;
   function logPiEvent(piEvent) {
@@ -231525,17 +232000,17 @@ function createAgentEventLogger(event) {
       const pending2 = pendingToolCalls.get(piEvent.toolCallId);
       pendingToolCalls.delete(piEvent.toolCallId);
       if (piEvent.isError) {
-        logToolCallFailed(log160, piEvent, pending2);
+        logToolCallFailed(log161, piEvent, pending2);
       }
     }
-    log160.debug(`Agent event ${piEvent.type}`, {
+    log161.debug(`Agent event ${piEvent.type}`, {
       sequence: sequence2++,
       get detail() {
         return formatPiAgentEventDetail(piEvent);
       }
     });
   }
-  return { log: log160, logPiEvent };
+  return { log: log161, logPiEvent };
 }
 var PI_AGENT_EVENT_DETAIL_MAX_CHARS;
 var init_agent_event_log = __esm({
@@ -232306,11 +232781,33 @@ function createStablePromptCacheKey(model, payload, provider) {
   const key = `tarsk-${digest}`;
   return key.length <= OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH2 ? key : key.slice(0, OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH2);
 }
-function applyStablePromptCacheKey(payload, model, provider, sessionId, baseUrl) {
+function payloadHasCacheablePrefix(payload) {
+  const tools = extractPayloadSections(payload).tools;
+  return tools !== void 0 && tools !== null;
+}
+function resolveFrozenPromptCacheKey(model, payload, provider, sessionId, lane = "agent") {
+  const computed = createStablePromptCacheKey(model, payload, provider);
+  if (lane !== "agent" || !sessionId) {
+    return computed;
+  }
+  const frozen = frozenAgentCacheKeyBySession.get(sessionId);
+  if (frozen) {
+    return frozen;
+  }
+  if (payloadHasCacheablePrefix(payload)) {
+    touchTrackedMap(frozenAgentCacheKeyBySession, sessionId, computed);
+  }
+  return computed;
+}
+function shouldLogPromptCachePrefixMiss(prefix, hasPrevious) {
+  return hasPrevious && prefix !== void 0 && prefix.appendOnly === false;
+}
+function applyStablePromptCacheKey(payload, model, provider, sessionId, baseUrl, lane = "agent") {
   if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
     return payload;
   }
   const record2 = payload;
+  const resolvedKey = resolveFrozenPromptCacheKey(model, payload, provider, sessionId, lane);
   if (isOpenRouterCacheHost(provider, baseUrl)) {
     const next = { ...record2 };
     delete next.prompt_cache_key;
@@ -232320,12 +232817,13 @@ function applyStablePromptCacheKey(payload, model, provider, sessionId, baseUrl)
     return next;
   }
   if (isOllamaCloudApiUrl(baseUrl)) {
+    const affinityId = lane === "agent" ? resolvedKey : sessionId;
     const next = {
       ...record2,
-      prompt_cache_key: createStablePromptCacheKey(model, payload, provider)
+      prompt_cache_key: resolvedKey
     };
-    if (typeof sessionId === "string" && sessionId.length > 0) {
-      next.session_id = sessionId;
+    if (typeof affinityId === "string" && affinityId.length > 0) {
+      next.session_id = affinityId;
     }
     return next;
   }
@@ -232334,12 +232832,12 @@ function applyStablePromptCacheKey(payload, model, provider, sessionId, baseUrl)
   }
   return {
     ...record2,
-    prompt_cache_key: createStablePromptCacheKey(model, payload, provider)
+    prompt_cache_key: resolvedKey
   };
 }
 function applyPromptCacheToProviderPayload(payload, modelId, provider, sessionId, baseUrl, lane = "agent") {
   const cacheSessionId = promptCacheLaneSessionId(sessionId, lane);
-  const next = applyStablePromptCacheKey(payload, modelId, provider, cacheSessionId, baseUrl);
+  const next = applyStablePromptCacheKey(payload, modelId, provider, cacheSessionId, baseUrl, lane);
   recordPromptCacheFingerprint(cacheSessionId, provider, modelId, next, baseUrl);
   return next;
 }
@@ -232497,6 +232995,8 @@ function clearPromptCacheSessionState(sessionId) {
   usageBySession.delete(sessionId);
   lastFingerprintBySession.delete(sessionId);
   warnedNoCacheSessions.delete(sessionId);
+  frozenAgentCacheKeyBySession.delete(sessionId);
+  frozenAgentCacheKeyBySession.delete(promptCacheLaneSessionId(sessionId, "compact"));
   for (const key of [...previousBySession.keys()]) {
     if (key.endsWith(`:${sessionId}`)) {
       previousBySession.delete(key);
@@ -232520,7 +233020,9 @@ function recordPromptCacheFingerprint(sessionId, provider, model, payload, baseU
     implicitPromptCache
   });
   const prefix = previous ? comparePromptCacheFingerprints(previous, fingerprint) : void 0;
-  log58.debug("Prompt cache fingerprint", {
+  const systemChanged = previous ? previous.system !== fingerprint.system : void 0;
+  const toolsChanged = previous ? previous.tools !== fingerprint.tools : void 0;
+  const fingerprintFields = {
     sessionId,
     provider,
     model,
@@ -232536,17 +233038,22 @@ function recordPromptCacheFingerprint(sessionId, provider, model, payload, baseU
     messageCount: fingerprint.messageHashes.length,
     previousFull: previous?.full,
     previousMessageCount: previous?.messageHashes.length,
-    systemChanged: previous ? previous.system !== fingerprint.system : void 0,
-    toolsChanged: previous ? previous.tools !== fingerprint.tools : void 0,
+    systemChanged,
+    toolsChanged,
     messagesChanged: previous ? previous.messages !== fingerprint.messages : void 0,
     appendOnly: prefix?.appendOnly,
     reusedMessages: prefix?.reusedMessages,
     firstDivergentIndex: prefix?.firstDivergentIndex,
     divergentLayer: prefix?.divergentLayer
-  });
+  };
+  if (shouldLogPromptCachePrefixMiss(prefix, previous !== void 0)) {
+    log58.info("Prompt cache prefix miss", fingerprintFields);
+  } else {
+    log58.debug("Prompt cache fingerprint", fingerprintFields);
+  }
   return fingerprint;
 }
-var log58, MAX_TRACKED_SESSIONS2, previousBySession, messageHashByIdentity, OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH2, ZERO_CACHE_MIN_CALLS, ZERO_CACHE_HIT_RATE_THRESHOLD, warnedNoCacheSessions, usageBySession, lastFingerprintBySession;
+var log58, MAX_TRACKED_SESSIONS2, previousBySession, messageHashByIdentity, OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH2, ZERO_CACHE_MIN_CALLS, ZERO_CACHE_HIT_RATE_THRESHOLD, warnedNoCacheSessions, usageBySession, lastFingerprintBySession, frozenAgentCacheKeyBySession;
 var init_prompt_cache_fingerprint = __esm({
   "src/agent/prompt-cache-fingerprint.ts"() {
     "use strict";
@@ -232562,6 +233069,7 @@ var init_prompt_cache_fingerprint = __esm({
     warnedNoCacheSessions = /* @__PURE__ */ new Set();
     usageBySession = /* @__PURE__ */ new Map();
     lastFingerprintBySession = /* @__PURE__ */ new Map();
+    frozenAgentCacheKeyBySession = /* @__PURE__ */ new Map();
   }
 });
 
@@ -239758,6 +240266,16 @@ var init_agent_processing_state_manager = __esm({
   }
 });
 
+// src/core/dev-mode.ts
+function isTarskDevelopmentMode(options2, env3 = process.env) {
+  return options2.isDebug || env3.MODE === "development" || env3.TARSK_ELECTROBUN_DEV === "1";
+}
+var init_dev_mode = __esm({
+  "src/core/dev-mode.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/env-manager.ts
 import { promises as fs14 } from "fs";
 import { join as join26 } from "path";
@@ -242337,6 +242855,86 @@ var init_auth_session = __esm({
   }
 });
 
+// src/features/account/command-confirmation.settings.ts
+function normalizeAllowAllCommands(raw2) {
+  return raw2 !== false;
+}
+function normalizeAllowedCommandPatterns(raw2) {
+  if (typeof raw2 !== "string" || raw2.trim().length === 0) {
+    return [];
+  }
+  try {
+    const parsed = JSON.parse(raw2);
+    if (!Array.isArray(parsed)) {
+      return [];
+    }
+    return parsed.filter((entry) => typeof entry === "string" && entry.length > 0);
+  } catch {
+    return [];
+  }
+}
+function mergeAllowedCommandPatterns(projects) {
+  const merged = /* @__PURE__ */ new Set();
+  for (const project of projects) {
+    for (const pattern of normalizeAllowedCommandPatterns(project.allowedCommandPatterns)) {
+      merged.add(pattern);
+    }
+  }
+  return [...merged];
+}
+function migrateAllowAllCommands(projects) {
+  if (projects.length === 0) {
+    return true;
+  }
+  return projects.every((project) => project.allowAllCommands !== 0);
+}
+async function loadProjectCommandRows(db) {
+  const result = await db.execute("SELECT allowAllCommands, allowedCommandPatterns FROM projects");
+  return result.rows;
+}
+async function ensureCommandConfirmationMigrated(db) {
+  const migrated = await getState(db, KEY_COMMAND_CONFIRMATION_MIGRATED);
+  if (migrated === true) {
+    return;
+  }
+  const projects = await loadProjectCommandRows(db);
+  await setState(db, KEY_ALLOW_ALL_COMMANDS, migrateAllowAllCommands(projects));
+  await setState(db, KEY_ALLOWED_COMMAND_PATTERNS, mergeAllowedCommandPatterns(projects));
+  await setState(db, KEY_COMMAND_CONFIRMATION_MIGRATED, true);
+}
+async function resolveAllowAllCommands(db) {
+  await ensureCommandConfirmationMigrated(db);
+  const raw2 = await getState(db, KEY_ALLOW_ALL_COMMANDS);
+  return normalizeAllowAllCommands(raw2);
+}
+async function resolveAllowedCommandPatterns(db) {
+  await ensureCommandConfirmationMigrated(db);
+  const raw2 = await getState(db, KEY_ALLOWED_COMMAND_PATTERNS);
+  if (Array.isArray(raw2)) {
+    return raw2.filter((entry) => typeof entry === "string" && entry.length > 0);
+  }
+  return normalizeAllowedCommandPatterns(raw2);
+}
+async function setAllowAllCommands(db, allowAllCommands) {
+  await ensureCommandConfirmationMigrated(db);
+  await setState(db, KEY_ALLOW_ALL_COMMANDS, allowAllCommands);
+}
+async function setAllowedCommandPatterns(db, patterns) {
+  await ensureCommandConfirmationMigrated(db);
+  const normalized = patterns.filter((pattern) => pattern.trim().length > 0);
+  await setState(db, KEY_ALLOWED_COMMAND_PATTERNS, normalized);
+}
+var KEY_ALLOW_ALL_COMMANDS, KEY_ALLOWED_COMMAND_PATTERNS, KEY_COMMAND_CONFIRMATION_MIGRATED;
+var init_command_confirmation_settings = __esm({
+  "src/features/account/command-confirmation.settings.ts"() {
+    "use strict";
+    init_database_state();
+    KEY_ALLOW_ALL_COMMANDS = "AllowAllCommands";
+    KEY_ALLOWED_COMMAND_PATTERNS = "AllowedCommandPatterns";
+    KEY_COMMAND_CONFIRMATION_MIGRATED = "CommandConfirmationMigrated";
+  }
+});
+
 // src/features/account/account-settings.route.ts
 function isCliDebugMode() {
   return process.argv.includes("--debug");
@@ -242389,7 +242987,7 @@ function normalizeFontScale(value2) {
   }
   return rounded;
 }
-function buildAccountSettingsResponse(rawColorScheme, rawFontScale, rawMaximumTurnCount, rawUseToolsThroughCode, rawVoiceAiProcessing, rawLogging, rawFileLogging, rawBetterStackLogging, rawShowDailySpend, rawSeatbeltSandboxEnabled, serverBindMode, modelAliases) {
+function buildAccountSettingsResponse(rawColorScheme, rawFontScale, rawMaximumTurnCount, rawUseToolsThroughCode, rawVoiceAiProcessing, rawLogging, rawFileLogging, rawBetterStackLogging, rawShowDailySpend, rawSeatbeltSandboxEnabled, allowAllCommands, allowedCommandPatterns, serverBindMode, modelAliases) {
   const betterStackEnvConfigured = isBetterStackEnvConfigured();
   const loggingEnabled = isLoggingEnabled(rawLogging, rawFileLogging, rawBetterStackLogging);
   const seatbeltHealth = checkSeatbeltSandboxHealth();
@@ -242407,6 +243005,8 @@ function buildAccountSettingsResponse(rawColorScheme, rawFontScale, rawMaximumTu
     seatbeltSandboxSupported: seatbeltHealth.supported,
     seatbeltSandboxHealthy: seatbeltHealth.healthy,
     seatbeltSandboxMessage: seatbeltHealth.message,
+    allowAllCommands,
+    allowedCommandPatterns,
     betterStackLoggingEnabled: loggingEnabled,
     betterStackEnvConfigured,
     betterStackIngestingHost: betterStackEnvConfigured ? getBetterStackIngestingHost() : null,
@@ -242470,6 +243070,8 @@ async function getAccountSettings(c) {
   const rawLogging = await getState(db, KEY_LOGGING);
   const rawShowDailySpend = await getState(db, KEY_SHOW_DAILY_SPEND);
   let rawSeatbeltSandboxEnabled = await getState(db, KEY_SEATBELT_SANDBOX_ENABLED);
+  const allowAllCommands = await resolveAllowAllCommands(db);
+  const allowedCommandPatterns = await resolveAllowedCommandPatterns(db);
   const serverBindMode = await getServerBindModeSetting();
   const modelAliases = await getModelAliases(db);
   if (isSeatbeltSandboxPreferenceEnabled(rawSeatbeltSandboxEnabled)) {
@@ -242488,6 +243090,8 @@ async function getAccountSettings(c) {
       rawBetterStackLogging,
       rawShowDailySpend,
       rawSeatbeltSandboxEnabled,
+      allowAllCommands,
+      allowedCommandPatterns,
       serverBindMode,
       modelAliases
     )
@@ -242583,6 +243187,13 @@ async function applyFontScaleUpdate(db, value2) {
     await setState(db, KEY_FONT_SCALE, normalizeFontScale(value2));
   }
 }
+async function applyAllowedCommandPatternsUpdate(db, value2) {
+  if (!Array.isArray(value2)) {
+    return;
+  }
+  const patterns = value2.filter((entry) => typeof entry === "string");
+  await setAllowedCommandPatterns(db, patterns);
+}
 async function buildUpdatedAccountSettingsResponse(db) {
   const rawColorScheme = await getState(db, KEY_COLOR_SCHEME);
   const rawFontScale = await getState(db, KEY_FONT_SCALE);
@@ -242594,6 +243205,8 @@ async function buildUpdatedAccountSettingsResponse(db) {
   const rawLogging = await getState(db, KEY_LOGGING);
   const rawShowDailySpend = await getState(db, KEY_SHOW_DAILY_SPEND);
   const rawSeatbeltSandboxEnabled = await getState(db, KEY_SEATBELT_SANDBOX_ENABLED);
+  const allowAllCommands = await resolveAllowAllCommands(db);
+  const allowedCommandPatterns = await resolveAllowedCommandPatterns(db);
   const serverBindMode = readServerBindMode();
   const modelAliases = await getModelAliases(db);
   return buildAccountSettingsResponse(
@@ -242607,6 +243220,8 @@ async function buildUpdatedAccountSettingsResponse(db) {
     rawBetterStackLogging,
     rawShowDailySpend,
     rawSeatbeltSandboxEnabled,
+    allowAllCommands,
+    allowedCommandPatterns,
     serverBindMode,
     modelAliases
   );
@@ -242623,6 +243238,10 @@ async function updateAccountSettings(c, metadataManager) {
   if (seatbeltError) {
     return c.json(seatbeltError, 400);
   }
+  if (typeof body.allowAllCommands === "boolean") {
+    await setAllowAllCommands(db, body.allowAllCommands);
+  }
+  await applyAllowedCommandPatternsUpdate(db, body.allowedCommandPatterns);
   await applyLoggingUpdate(db, body);
   await applyMaximumTurnCountUpdate(db, body.maximumTurnCount);
   const bindModeError = await applyServerBindModeUpdate(body.serverBindMode);
@@ -242652,6 +243271,7 @@ var init_account_settings_route = __esm({
     init_auth_session();
     init_project_model_aliases();
     init_sandbox();
+    init_command_confirmation_settings();
     DEFAULT_MAXIMUM_TURN_COUNT = 100;
     DEFAULT_FONT_SCALE = 100;
     MIN_FONT_SCALE = 75;
@@ -243241,14 +243861,12 @@ function buildExecutionContext(args2) {
     customSystemPrompt: args2.project?.customSystemPrompt,
     useCustomSystemPrompt: args2.project?.useCustomSystemPrompt,
     projectId: args2.projectId,
-    allowAllCommands: args2.slackBranchAutoAllow ? true : args2.project?.allowAllCommands !== false,
+    allowAllCommands: args2.slackBranchAutoAllow ? true : args2.allowAllCommands,
     allowAllFetches: args2.slackBranchAutoAllow,
-    allowedCommandPatterns: args2.project?.allowedCommandPatterns ?? [],
+    allowedCommandPatterns: args2.allowedCommandPatterns,
     persistProjectCommandPatterns: async (patterns) => {
       const dbInstance2 = await getDatabase();
-      await updateProject(dbInstance2, args2.projectId, {
-        allowedCommandPatterns: patterns
-      });
+      await setAllowedCommandPatterns(dbInstance2, patterns);
     },
     allowedFetchDomains: args2.project?.allowedFetchDomains ?? [],
     persistProjectFetchDomains: async (domains) => {
@@ -244392,6 +245010,8 @@ async function resolveChatExecution(c, request3, target, metadataManager) {
   let model = baseModel;
   const project = await getProject(db, thread.projectId);
   const seatbeltSandboxEnabled = await resolveSeatbeltSandboxEnabled(db);
+  const allowAllCommands = await resolveAllowAllCommands(db);
+  const allowedCommandPatterns = await resolveAllowedCommandPatterns(db);
   const modelAliases = await getModelAliases(db);
   if (autoRoute) {
     const decision = await routePromptToDecision(userContent, modelAliases, metadataManager);
@@ -244431,6 +245051,8 @@ async function resolveChatExecution(c, request3, target, metadataManager) {
     slackBranchAutoAllow,
     attribution,
     seatbeltSandboxEnabled,
+    allowAllCommands,
+    allowedCommandPatterns,
     smartAliasModelSettings,
     projectId: thread.projectId,
     modelAliases
@@ -244625,6 +245247,8 @@ async function launchGoalRun(c, goal, threadManager, agentExecutor, conversation
     }
     const { provider, model } = resolveProviderAndModel(launchModel.provider, launchModel.model);
     const seatbeltSandboxEnabled = await resolveSeatbeltSandboxEnabled(db);
+    const allowAllCommands = await resolveAllowAllCommands(db);
+    const allowedCommandPatterns = await resolveAllowedCommandPatterns(db);
     const modelAliases = await getModelAliases(db);
     const { availableSkills, activatedSkills, agents } = await loadSkillAndAgentContext(
       thread,
@@ -244647,6 +245271,8 @@ async function launchGoalRun(c, goal, threadManager, agentExecutor, conversation
       project,
       slackBranchAutoAllow: false,
       seatbeltSandboxEnabled,
+      allowAllCommands,
+      allowedCommandPatterns,
       projectId: thread.projectId,
       modelAliases
     });
@@ -244736,6 +245362,7 @@ var init_chat_post_route = __esm({
     init_database();
     init_database_state();
     init_account_settings_route();
+    init_command_confirmation_settings();
     init_model_aliases_store();
     init_project_tasks_database();
     init_git_status_cache_database();
@@ -244805,6 +245432,15 @@ var init_start_turn = __esm({
 });
 
 // src/features/threads/threads-messages.mapper.ts
+function parseThreadMessageTranscriptView(value2) {
+  if (value2 === void 0 || value2 === "full") {
+    return "full";
+  }
+  if (value2 === "final") {
+    return "final";
+  }
+  return null;
+}
 function resolveGeneratedImageFields(events, storedImageUrl, rawContent) {
   const storedRefs = storedImageUrl ? parseGeneratedImagePayload(storedImageUrl) ?? { imageUrl: storedImageUrl } : {};
   const eventRefs = extractGeneratedImageFromEvents(events);
@@ -244959,7 +245595,7 @@ function buildMessageMetadata(tokenCount, estimatedCost, processingTimeMs) {
     }
   };
 }
-function buildAgentMessage(message, response, pricingByModelId, threadModelId) {
+function buildAgentMessage(message, response, pricingByModelId, threadModelId, transcriptView = "full") {
   if (isTarskAgentNoteModel(message.request.model)) {
     const { content: sanitizedContent2 } = sanitizeStructuredMessageContent(response.content);
     return {
@@ -244971,7 +245607,8 @@ function buildAgentMessage(message, response, pricingByModelId, threadModelId) {
       senderLabel: TARSK_AGENT_NOTE_LABEL
     };
   }
-  const usageFromEvents = extractUsageFromEvents(response.events);
+  const events = transcriptView === "final" ? [] : response.events;
+  const usageFromEvents = extractUsageFromEvents(events);
   const tokenCount = resolveTokenCount(usageFromEvents, message);
   const estimatedCost = resolveEstimatedCost(
     message,
@@ -244980,13 +245617,9 @@ function buildAgentMessage(message, response, pricingByModelId, threadModelId) {
     threadModelId
   );
   const processingTimeMs = resolveProcessingTimeMs(message, response.completedAt);
-  const rawContent = buildStructuredContentFromEvents(response.events, response.content);
+  const rawContent = transcriptView === "final" ? response.content : buildStructuredContentFromEvents(response.events, response.content);
   const { content: sanitizedContent } = sanitizeStructuredMessageContent(rawContent);
-  const generatedImage = resolveGeneratedImageFields(
-    response.events,
-    response.imageUrl,
-    rawContent
-  );
+  const generatedImage = resolveGeneratedImageFields(events, response.imageUrl, rawContent);
   return {
     messageId: `agent-${message.id}`,
     sender: "agent",
@@ -245006,7 +245639,7 @@ function buildTurnPrefix(message) {
     hasUserMessage: message.request.message.trim().length > 0
   };
 }
-function toThreadMessageResponses(message, pricingByModelId, threadModelId) {
+function toThreadMessageResponses(message, pricingByModelId, threadModelId, transcriptView = "full") {
   const prefix = buildTurnPrefix(message);
   if (!message.response) {
     return prefix.hasUserMessage ? [prefix.userMessage, ...prefix.steeringMessages] : [...prefix.steeringMessages];
@@ -245015,13 +245648,14 @@ function toThreadMessageResponses(message, pricingByModelId, threadModelId) {
     message,
     message.response,
     pricingByModelId,
-    threadModelId
+    threadModelId,
+    transcriptView
   );
   return prefix.hasUserMessage ? [prefix.userMessage, ...prefix.steeringMessages, agentMessage] : [...prefix.steeringMessages, agentMessage];
 }
-function mapConversationMessagesToThreadResponse(messages, pricingByModelId, threadModelId) {
+function mapConversationMessagesToThreadResponse(messages, pricingByModelId, threadModelId, transcriptView = "full") {
   return messages.flatMap(
-    (message) => toThreadMessageResponses(message, pricingByModelId, threadModelId)
+    (message) => toThreadMessageResponses(message, pricingByModelId, threadModelId, transcriptView)
   );
 }
 var init_threads_messages_mapper = __esm({
@@ -245452,9 +246086,6 @@ async function postAgentNote(c, threadManager, conversationManager) {
     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
@@ -246080,9 +246711,9 @@ var init_conversations_manager = __esm({
       /**
        * Gets the conversation history for a thread (all conversations)
        */
-      async getConversationHistory(threadId) {
+      async getConversationHistory(threadId, options2) {
         try {
-          return await getConversationHistory(this.db, threadId);
+          return await getConversationHistory(this.db, threadId, options2);
         } catch (error2) {
           log87.error("Failed to get conversation history", { error: error2, threadId });
           throw error2;
@@ -246091,13 +246722,14 @@ var init_conversations_manager = __esm({
       /**
        * Gets the conversation history for a specific conversation
        */
-      async getConversationHistoryByConversationId(threadId, conversationId, eventLimit) {
+      async getConversationHistoryByConversationId(threadId, conversationId, eventLimit, options2) {
         try {
           return await getConversationHistoryByConversationId(
             this.db,
             threadId,
             conversationId,
-            eventLimit
+            eventLimit,
+            options2
           );
         } catch (error2) {
           log87.error("Failed to get conversation history by conversation ID", {
@@ -246298,7 +246930,23 @@ var init_conversations_manager = __esm({
         try {
           await unmarkConversationComplete(this.db, threadId, conversationId);
         } catch (error2) {
-          log87.error("Failed to clear conversation completion", { error: error2, threadId, conversationId });
+          log87.error("Failed to dismiss conversation completion", { error: error2, threadId, conversationId });
+          throw error2;
+        }
+      }
+      async clearThreadCompleteMarks(threadId) {
+        try {
+          await clearThreadCompletionMarks(this.db, threadId);
+        } catch (error2) {
+          log87.error("Failed to clear thread completion marks", { error: error2, threadId });
+          throw error2;
+        }
+      }
+      async getCompletedConversationIds(threadId) {
+        try {
+          return await getCompletedConversationIds(this.db, threadId);
+        } catch (error2) {
+          log87.error("Failed to get completed conversation IDs", { error: error2, threadId });
           throw error2;
         }
       }
@@ -247177,6 +247825,60 @@ var init_conversations_clear_complete_route = __esm({
   }
 });
 
+// src/features/conversations/conversations-get-completions.route.ts
+async function getCompletedConversationIds2(c, conversationManager, threadManager) {
+  try {
+    const thread = await requireExistingThread(c, threadManager);
+    if (!thread.ok) {
+      return thread.response;
+    }
+    const conversationIds = await conversationManager.getCompletedConversationIds(thread.threadId);
+    return successResponse(c, { conversationIds }, 200);
+  } catch (error2) {
+    return caughtErrorResponse(
+      c,
+      ErrorCodes.HISTORY_FETCH_ERROR,
+      "Failed to get completed conversations",
+      error2
+    );
+  }
+}
+var init_conversations_get_completions_route = __esm({
+  "src/features/conversations/conversations-get-completions.route.ts"() {
+    "use strict";
+    init_error_responses();
+    init_route_helpers();
+    init_conversation_route_params();
+  }
+});
+
+// src/features/conversations/conversations-clear-thread-complete.route.ts
+async function clearThreadCompleteMarks(c, conversationManager, threadManager) {
+  try {
+    const thread = await requireExistingThread(c, threadManager);
+    if (!thread.ok) {
+      return thread.response;
+    }
+    await conversationManager.clearThreadCompleteMarks(thread.threadId);
+    return successResponse(c, { threadId: thread.threadId }, 200);
+  } catch (error2) {
+    return caughtErrorResponse(
+      c,
+      ErrorCodes.HISTORY_FETCH_ERROR,
+      "Failed to clear thread completion marks",
+      error2
+    );
+  }
+}
+var init_conversations_clear_thread_complete_route = __esm({
+  "src/features/conversations/conversations-clear-thread-complete.route.ts"() {
+    "use strict";
+    init_error_responses();
+    init_route_helpers();
+    init_conversation_route_params();
+  }
+});
+
 // src/features/conversations/conversations-export.route.ts
 function jsonlResponse(body, filename) {
   return new Response(body, {
@@ -247667,6 +248369,10 @@ function createConversationRoutes(conversationManager, threadManager, metadataMa
     "/:threadId/usage-summary",
     (c) => handleGetThreadUsageSummary(c, conversationManager, threadManager)
   );
+  router.get(
+    "/:threadId/completions",
+    (c) => getCompletedConversationIds2(c, conversationManager, threadManager)
+  );
   router.get(
     "/:threadId/:conversationId/usage",
     (c) => handleGetConversationUsage(c, conversationManager, threadManager)
@@ -247720,6 +248426,10 @@ function createConversationRoutes(conversationManager, threadManager, metadataMa
     "/:threadId/:conversationId/complete",
     (c) => clearConversationComplete(c, conversationManager, threadManager)
   );
+  router.delete(
+    "/:threadId/complete",
+    (c) => clearThreadCompleteMarks(c, conversationManager, threadManager)
+  );
   router.delete(
     "/:threadId/:conversationId",
     (c) => deleteConversation(c, conversationManager, threadManager)
@@ -247746,6 +248456,8 @@ var init_conversations_routes = __esm({
     init_conversations_unarchive_route();
     init_conversations_sibling_route();
     init_conversations_clear_complete_route();
+    init_conversations_get_completions_route();
+    init_conversations_clear_thread_complete_route();
     init_conversations_export_route();
     init_token_usage_route();
     init_context_breakdown_route();
@@ -263388,12 +264100,19 @@ async function handleGetThreadMessages(c, threadManager, conversationManager) {
       return existing.response;
     }
     const { threadId, thread } = existing;
+    const transcriptView = parseThreadMessageTranscriptView(c.req.query("view"));
+    if (!transcriptView) {
+      return errorResponse(c, ErrorCodes.INVALID_REQUEST, "view must be full or final", 400);
+    }
+    const historyRead = transcriptView === "final" ? { omitEvents: true } : void 0;
     const requestedConversationId = c.req.query("conversationId");
     const targetConversationId = typeof requestedConversationId === "string" && requestedConversationId.length > 0 ? requestedConversationId : thread.currentConversationId;
     const history2 = targetConversationId ? await conversationManager.getConversationHistoryByConversationId(
       threadId,
-      targetConversationId
-    ) : await conversationManager.getConversationHistory(threadId);
+      targetConversationId,
+      void 0,
+      historyRead
+    ) : await conversationManager.getConversationHistory(threadId, historyRead);
     if (!history2 || history2.messages.length === 0) {
       return c.json([]);
     }
@@ -263403,7 +264122,12 @@ async function handleGetThreadMessages(c, threadManager, conversationManager) {
     );
     const pricingByModelId = await buildPricingByModelId(providerIds);
     return c.json(
-      mapConversationMessagesToThreadResponse(history2.messages, pricingByModelId, thread.model)
+      mapConversationMessagesToThreadResponse(
+        history2.messages,
+        pricingByModelId,
+        thread.model,
+        transcriptView
+      )
     );
   } catch (error2) {
     return caughtErrorResponse(
@@ -332832,8 +333556,8 @@ var debug2;
 var init_debug = __esm({
   "../node_modules/.bun/@puppeteer+browsers@3.0.5+b412256286331130/node_modules/@puppeteer/browsers/lib/debug.js"() {
     debug2 = (prefix) => {
-      const log160 = debuglog2(prefix);
-      return log160.enabled ? log160 : void 0;
+      const log161 = debuglog2(prefix);
+      return log161.enabled ? log161 : void 0;
     };
   }
 });
@@ -417227,17 +417951,17 @@ async function resolveGitThreadContext(c, metadataManager, options2 = {}) {
     };
   }
 }
-async function resolveGitBranchContext(c, metadataManager, log160) {
+async function resolveGitBranchContext(c, metadataManager, log161) {
   const resolved = await resolveGitThreadContext(c, metadataManager);
   if (!resolved.ok) {
     return resolved;
   }
   const { threadId, thread, absolutePath, gitRoot } = resolved.context;
-  log160.info("Thread found", { threadId, title: thread.title });
-  log160.info("Resolved thread path", { absolutePath });
-  log160.info("Resolved git root", { gitRoot });
+  log161.info("Thread found", { threadId, title: thread.title });
+  log161.info("Resolved thread path", { absolutePath });
+  log161.info("Resolved git root", { gitRoot });
   const currentBranch = await getCurrentBranch(gitRoot);
-  log160.info("Resolved current branch", { currentBranch });
+  log161.info("Resolved current branch", { currentBranch });
   return {
     ok: true,
     context: { ...resolved.context, currentBranch }
@@ -421035,11 +421759,23 @@ var init_agents_routes = __esm({
 
 // src/features/project-tasks/task-execution.ts
 function claimFailureMessage(task) {
-  if (task.working) {
-    return "Task is already running";
-  }
   return `Failed to claim task: ${task.id}`;
 }
+function isScheduleOneShot(task) {
+  return Boolean(task.scheduledAt?.trim());
+}
+function isBenignClaimMiss(before, after, guards) {
+  if (!after) {
+    return false;
+  }
+  if (guards.requirePendingSchedule && !after.scheduledAt) {
+    return true;
+  }
+  if (guards.matchLastTriggeredAt && after.lastTriggeredAt !== before.lastTriggeredAt) {
+    return true;
+  }
+  return false;
+}
 async function loadAndClaimTask(taskId, options2) {
   const db = await getDatabase();
   const task = await getTaskById(db, taskId);
@@ -421047,13 +421783,22 @@ async function loadAndClaimTask(taskId, options2) {
     throw new Error(`Task not found: ${taskId}`);
   }
   const now = (/* @__PURE__ */ new Date()).toISOString();
+  const requirePendingSchedule = options2.trigger === "schedule" && isScheduleOneShot(task);
+  const matchLastTriggeredAt = options2.trigger === "schedule" && Boolean(task.scheduleCron);
   const claimed = await claimTaskForAutomatedRun(db, task.id, {
     status: "Build",
     lastTriggeredAt: now,
     clearSchedule: options2.clearSchedule,
-    requireEnabled: options2.requireEnabled
+    requireEnabled: options2.requireEnabled,
+    requirePendingSchedule,
+    matchLastTriggeredAt,
+    expectedLastTriggeredAt: task.lastTriggeredAt
   });
   if (!claimed) {
+    const current = await getTaskById(db, taskId);
+    if (isBenignClaimMiss(task, current, { requirePendingSchedule, matchLastTriggeredAt })) {
+      throw new TaskRunSkippedError(task.id);
+    }
     throw new Error(claimFailureMessage(task));
   }
   return { db, task, now };
@@ -421096,6 +421841,7 @@ async function attachThreadToTask(db, task, createdThreadId, now) {
   if (!taskWithThread) {
     throw new Error(`Failed to attach thread to task: ${task.id}`);
   }
+  await registerActiveTaskRun(db, task.id, createdThreadId);
   return taskWithThread;
 }
 function chatLaunchErrorMessage(response) {
@@ -421148,16 +421894,16 @@ async function markTaskLaunchSucceeded(db, taskId) {
   }
   return launched;
 }
-async function restoreTaskAfterFailure(db, task, error2) {
+async function restoreTaskAfterFailure(db, task, error2, threadId) {
   log137.error("Automated task run failed", {
     taskId: task.id,
     projectId: task.projectId,
     title: task.title,
     error: error2
   });
+  await releaseAutomatedRun(db, task.id, threadId);
   const currentTask = await getTaskById(db, task.id);
   const restored = await updateTask(db, task.id, {
-    working: false,
     threadId: currentTask?.threadId ?? task.threadId,
     lastRunStatus: "failed"
   });
@@ -421167,14 +421913,15 @@ async function restoreTaskAfterFailure(db, task, error2) {
 }
 async function executeTaskInNewThread(taskId, deps2, options2 = {}) {
   const { db, task, now } = await loadAndClaimTask(taskId, options2);
+  let createdThreadId = null;
   try {
-    const createdThreadId = await createThreadForTask(task, deps2);
+    createdThreadId = await createThreadForTask(task, deps2);
     await attachThreadToTask(db, task, createdThreadId, now);
     await launchTaskChat(task, createdThreadId, deps2, options2);
     await recordTaskRunHistory(db, task, createdThreadId, options2);
     return markTaskLaunchSucceeded(db, task.id);
   } catch (error2) {
-    await restoreTaskAfterFailure(db, task, error2);
+    await restoreTaskAfterFailure(db, task, error2, createdThreadId);
     throw error2;
   }
 }
@@ -421223,7 +421970,7 @@ function promptAlreadyInvokesSkill(description, skillRef) {
     (reference) => reference.name === normalizedReference
   );
 }
-var log137;
+var log137, TaskRunSkippedError;
 var init_task_execution = __esm({
   "src/features/project-tasks/task-execution.ts"() {
     "use strict";
@@ -421235,6 +421982,12 @@ var init_task_execution = __esm({
     init_task_default_model();
     init_project_tasks_database();
     log137 = createLogger("task.execution");
+    TaskRunSkippedError = class extends Error {
+      constructor(taskId) {
+        super(`Task run already claimed: ${taskId}`);
+        this.name = "TaskRunSkippedError";
+      }
+    };
   }
 });
 
@@ -439818,13 +440571,13 @@ var require_mock_call_history = __commonJS({
     function makeFilterCalls(parameterName) {
       return (parameterValue, logs) => {
         if (typeof parameterValue === "string" || parameterValue == null) {
-          return logs.filter((log160) => {
-            return log160[parameterName] === parameterValue;
+          return logs.filter((log161) => {
+            return log161[parameterName] === parameterValue;
           });
         }
         if (parameterValue instanceof RegExp) {
-          return logs.filter((log160) => {
-            return parameterValue.test(log160[parameterName]);
+          return logs.filter((log161) => {
+            return parameterValue.test(log161[parameterName]);
           });
         }
         throw new InvalidArgumentError(`${parameterName} parameter should be one of string, regexp, undefined or null`);
@@ -439919,8 +440672,8 @@ var require_mock_call_history = __commonJS({
           return this.logs.filter(criteria);
         }
         if (criteria instanceof RegExp) {
-          return this.logs.filter((log160) => {
-            return criteria.test(log160.toString());
+          return this.logs.filter((log161) => {
+            return criteria.test(log161.toString());
           });
         }
         if (typeof criteria === "object" && criteria !== null) {
@@ -439970,13 +440723,13 @@ var require_mock_call_history = __commonJS({
         this.logs = [];
       }
       [kMockCallHistoryAddLog](requestInit) {
-        const log160 = new MockCallHistoryLog(requestInit);
-        this.logs.push(log160);
-        return log160;
+        const log161 = new MockCallHistoryLog(requestInit);
+        this.logs.push(log161);
+        return log161;
       }
       *[Symbol.iterator]() {
-        for (const log160 of this.calls()) {
-          yield log160;
+        for (const log161 of this.calls()) {
+          yield log161;
         }
       }
     };
@@ -458736,19 +459489,19 @@ async function pollDueTasks(deps2, now = /* @__PURE__ */ new Date()) {
   const db = await getDatabase();
   const nowIso = now.toISOString();
   const oneShotTasks = await getDueOneShotScheduleTasks(db, nowIso);
-  for (const row of oneShotTasks) {
-    await runScheduledTask(row.id, deps2, row);
-  }
   const recurringTasks = await getRecurringScheduleTasks(db);
-  for (const row of recurringTasks) {
+  const dueRecurringTasks = recurringTasks.filter(function isDueRecurringTask(row) {
     if (!row.scheduleCron || !row.timezone) {
-      continue;
-    }
-    if (!isCronDue(row.scheduleCron, row.timezone, row.lastTriggeredAt, now)) {
-      continue;
+      return false;
     }
-    await runScheduledTask(row.id, deps2, row);
-  }
+    return isCronDue(row.scheduleCron, row.timezone, row.lastTriggeredAt, now);
+  });
+  const dueTasks = [...oneShotTasks, ...dueRecurringTasks];
+  await Promise.all(
+    dueTasks.map(function launchDueTask(row) {
+      return runScheduledTask(row.id, deps2, row);
+    })
+  );
 }
 async function runScheduledTask(taskId, deps2, task) {
   try {
@@ -458771,6 +459524,9 @@ async function runScheduledTask(taskId, deps2, task) {
       lastRunStatus: launched.lastRunStatus
     });
   } catch (error2) {
+    if (error2 instanceof Error && error2.name === "TaskRunSkippedError") {
+      return;
+    }
     log157.error("Failed to run scheduled task", {
       error: error2,
       taskId,
@@ -458794,19 +459550,127 @@ var init_task_scheduler = __esm({
   }
 });
 
+// src/features/git/pr-merged-scanner.ts
+function startPrMergedScanner(deps2) {
+  const timer2 = setInterval(() => {
+    void scanForMergedPullRequests(deps2);
+  }, SCAN_INTERVAL_MS);
+  void scanForMergedPullRequests(deps2);
+  return timer2;
+}
+async function scanForMergedPullRequests(deps2) {
+  try {
+    const db = await getDatabase();
+    const threads = await deps2.metadataManager.loadThreads();
+    for (const thread of threads) {
+      try {
+        await scanThreadForMergedPullRequest(db, deps2, thread);
+      } catch (error2) {
+        log158.warn("Merged-PR scan skipped a thread after an error", {
+          threadId: thread.id,
+          branch: thread.currentBranch,
+          error: error2
+        });
+      }
+    }
+  } catch (error2) {
+    log158.error("Merged-PR scan failed", { error: error2 });
+  }
+}
+async function resolveScanContext(deps2, thread) {
+  const branch = thread.currentBranch;
+  if (!branch || branch === "HEAD") {
+    return null;
+  }
+  if (deps2.processingStateManager.isProcessing(thread.id)) {
+    return null;
+  }
+  let gitRoot;
+  try {
+    gitRoot = await getGitRoot(resolveThreadPath(thread.path ?? ""));
+  } catch {
+    return null;
+  }
+  const defaultBranch = await findDefaultBranchCached(gitRoot).catch(() => null);
+  if (!defaultBranch || branch === defaultBranch) {
+    return null;
+  }
+  return { gitRoot, branch };
+}
+async function getMergedPrUrl(gitRoot, branch) {
+  const prStatus = await getPullRequestStatusCached(gitRoot, branch, false).catch(() => null);
+  if (!prStatus?.exists || prStatus.state !== "MERGED" || !prStatus.url) {
+    return null;
+  }
+  return prStatus.url;
+}
+async function markUnmarkedConversations(db, thread, branch, prUrl) {
+  const [mergeable, completionRows] = await Promise.all([
+    getMergeableConversationIds(db, thread.id),
+    getConversationCompletionRows(db, thread.id)
+  ]);
+  const knownConversationIds = new Set(completionRows.map((row) => row.conversationId));
+  const unmarked = mergeable.filter((conversationId) => !knownConversationIds.has(conversationId));
+  if (unmarked.length === 0) {
+    return;
+  }
+  for (const conversationId of unmarked) {
+    await markConversationComplete(db, thread.id, conversationId);
+  }
+  const markedCount = unmarked.length;
+  const previous = scanEchoes.get(thread.id);
+  if (!previous || previous.prUrl !== prUrl || previous.markedCount !== markedCount) {
+    log158.info("Marked chats as merged", {
+      threadId: thread.id,
+      projectId: thread.projectId,
+      branch,
+      prUrl,
+      markedCount
+    });
+    scanEchoes.set(thread.id, { branch, prUrl, markedCount });
+  }
+}
+async function scanThreadForMergedPullRequest(db, deps2, thread) {
+  const context2 = await resolveScanContext(deps2, thread);
+  if (!context2) {
+    return;
+  }
+  const prUrl = await getMergedPrUrl(context2.gitRoot, context2.branch);
+  if (!prUrl) {
+    scanEchoes.delete(thread.id);
+    return;
+  }
+  await markUnmarkedConversations(db, thread, context2.branch, prUrl);
+}
+var log158, SCAN_INTERVAL_MS, scanEchoes;
+var init_pr_merged_scanner = __esm({
+  "src/features/git/pr-merged-scanner.ts"() {
+    "use strict";
+    init_dist();
+    init_database();
+    init_conversations_database();
+    init_git_utils();
+    log158 = createLogger("git.prMergedScanner");
+    SCAN_INTERVAL_MS = 6e4;
+    scanEchoes = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/features/inbound-events/inbound-events.service.ts
 async function dispatchProjectEvent(db, projectId, eventKey, payload, deps2) {
   const matches = await getEnabledEventTasksByKey(db, projectId, eventKey);
-  let launched = 0;
-  let skipped = 0;
-  for (const task of matches) {
-    try {
-      await launchEventTask(task, deps2, eventKey, payload);
-      launched += 1;
-    } catch {
-      skipped += 1;
-    }
-  }
+  const outcomes = await Promise.all(
+    matches.map(async function launchMatchedTask(task) {
+      try {
+        await launchEventTask(task, deps2, eventKey, payload);
+        return "launched";
+      } catch {
+        return "skipped";
+      }
+    })
+  );
+  const launched = outcomes.filter((outcome) => outcome === "launched").length;
+  const skipped = outcomes.length - launched;
   return {
     matched: matches.length,
     launched,
@@ -458927,7 +459791,7 @@ var init_inbound_events_routes = __esm({
 async function openScreenRecordingSettings() {
   if (process.platform !== "darwin") {
     const message = "Screen recording settings are only available on macOS.";
-    log158.warn(`[ScreenRecordingSettings] ${message}`);
+    log159.warn(`[ScreenRecordingSettings] ${message}`);
     return {
       success: false,
       message,
@@ -458935,8 +459799,8 @@ async function openScreenRecordingSettings() {
     };
   }
   const settingsUrl = "x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture";
-  log158.info(`[ScreenRecordingSettings] Opening System Settings to Screen Recording pane...`);
-  log158.info(`[ScreenRecordingSettings] URL: ${settingsUrl}`);
+  log159.info(`[ScreenRecordingSettings] Opening System Settings to Screen Recording pane...`);
+  log159.info(`[ScreenRecordingSettings] URL: ${settingsUrl}`);
   try {
     const { shell, args: args2 } = getShellConfig();
     const result = spawnSyncProcess(shell, [...args2, `open "${settingsUrl}"`], {
@@ -458945,17 +459809,17 @@ async function openScreenRecordingSettings() {
       timeout: 5e3
     });
     if (result.status === 0) {
-      log158.info(`[ScreenRecordingSettings] Successfully opened System Settings`);
+      log159.info(`[ScreenRecordingSettings] Successfully opened System Settings`);
       return {
         success: true,
         message: "System Settings opened to Screen & Audio Recording pane."
       };
     } else {
       const stderr = typeof result.stderr === "string" ? result.stderr.trim() : "Unknown error";
-      log158.error(
+      log159.error(
         `[ScreenRecordingSettings] Failed to open System Settings. Exit code: ${result.status}`
       );
-      log158.error(`[ScreenRecordingSettings] stderr: ${stderr}`);
+      log159.error(`[ScreenRecordingSettings] stderr: ${stderr}`);
       return {
         success: false,
         message: "Failed to open System Settings. Please open it manually: System Settings > Privacy & Security > Screen & Audio Recording.",
@@ -458964,7 +459828,7 @@ async function openScreenRecordingSettings() {
     }
   } catch (error2) {
     const errorMessage4 = error2 instanceof Error ? error2.message : String(error2);
-    log158.error(`[ScreenRecordingSettings] Exception while opening System Settings:`, error2);
+    log159.error(`[ScreenRecordingSettings] Exception while opening System Settings:`, error2);
     return {
       success: false,
       message: "Failed to open System Settings. Please open it manually: System Settings > Privacy & Security > Screen & Audio Recording.",
@@ -458972,14 +459836,14 @@ async function openScreenRecordingSettings() {
     };
   }
 }
-var log158;
+var log159;
 var init_screen_recording_settings_opener = __esm({
   "src/features/system-permissions/screen-recording-settings-opener.ts"() {
     "use strict";
     init_utils();
     init_shell();
     init_dist();
-    log158 = createLogger("features.system-permissions.screen-recording-settings-opener");
+    log159 = createLogger("features.system-permissions.screen-recording-settings-opener");
   }
 });
 
@@ -459223,7 +460087,7 @@ async function bindTarskListeningServer(options2) {
             url: `http://localhost:${server.port ?? port}`,
             port: server.port ?? port,
             bound: true,
-            isDevMode: (server.port ?? port) !== options2.initialPort
+            isDevMode: options2.isDevMode
           };
         } catch (error2) {
           const errno = error2;
@@ -459260,7 +460124,7 @@ async function bindTarskListeningServer(options2) {
         url: `http://localhost:${port}`,
         port,
         bound: true,
-        isDevMode: port !== options2.initialPort
+        isDevMode: options2.isDevMode
       };
     }
   };
@@ -459277,7 +460141,7 @@ function registerProcessExitHandler() {
   });
 }
 function shutdownTarskServer() {
-  log159.info("Shutting down Tarsk server...");
+  log160.info("Shutting down Tarsk server...");
   resetTurnDispatch();
   try {
     if (activeProcessingStateManager) {
@@ -459289,27 +460153,27 @@ function shutdownTarskServer() {
       }
     }
   } catch (error2) {
-    log159.warn("Failed to abort in-flight agent runs during shutdown", { error: error2 });
+    log160.warn("Failed to abort in-flight agent runs during shutdown", { error: error2 });
   }
   try {
     activePtySessionManager?.shutdown();
   } catch (error2) {
-    log159.warn("Failed to stop PTY sessions during shutdown", { error: error2 });
+    log160.warn("Failed to stop PTY sessions during shutdown", { error: error2 });
   }
   try {
     scriptProcessManager.stopAll();
   } catch (error2) {
-    log159.warn("Failed to stop running scripts during shutdown", { error: error2 });
+    log160.warn("Failed to stop running scripts during shutdown", { error: error2 });
   }
   try {
     stopPublicTunnel();
   } catch (error2) {
-    log159.warn("Failed to stop the public address during shutdown", { error: error2 });
+    log160.warn("Failed to stop the public address during shutdown", { error: error2 });
   }
   try {
     cliProcessRegistry.killAll();
   } catch (error2) {
-    log159.warn("Failed to kill tracked child processes during shutdown", { error: error2 });
+    log160.warn("Failed to kill tracked child processes during shutdown", { error: error2 });
   }
   try {
     devServerCache.clearAll();
@@ -459328,9 +460192,16 @@ function shutdownTarskServer() {
     }
     activeTaskSchedulerTimer = null;
   }
+  if (activePrMergedScannerTimer) {
+    try {
+      clearInterval(activePrMergedScannerTimer);
+    } catch {
+    }
+    activePrMergedScannerTimer = null;
+  }
   void stopSlackBridge();
   startPromise = null;
-  log159.info("Tarsk server shutdown complete.");
+  log160.info("Tarsk server shutdown complete.");
 }
 function registerShutdownSignalHandlers() {
   if (signalHandlersRegistered) {
@@ -459362,7 +460233,7 @@ function resolveInitialServerPort(isDebug2) {
 }
 function mountServerLogging(app, initialPort) {
   app.onError((err2, c) => {
-    log159.error("Unhandled API route error", {
+    log160.error("Unhandled API route error", {
       method: c.req.method,
       path: c.req.path,
       error: err2
@@ -459380,7 +460251,7 @@ function mountServerLogging(app, initialPort) {
     const fullUrl = `${requestUrl.protocol}//${hostHeader}${reqPath}`;
     const isThreadMessages = reqPath.startsWith("/api/threads/") && reqPath.endsWith("/messages");
     if (!fullUrl.includes("processing") && !reqPath.startsWith("/api/logs") && !isThreadMessages) {
-      log159.info(`${method} ${fullUrl}`);
+      log160.info(`${method} ${fullUrl}`);
     }
     return next();
   });
@@ -459422,7 +460293,7 @@ async function selectBuiltInBotThreadIfNeeded(projectManager, threadManager, bui
 async function clearInterruptedTaskWorkingFlags() {
   const clearedWorkingTasks = await clearAllWorkingFlags(await getDatabase());
   if (clearedWorkingTasks > 0) {
-    log159.info(
+    log160.info(
       `Cleared working flag from ${clearedWorkingTasks} task(s) interrupted by the previous session`
     );
   }
@@ -459502,6 +460373,7 @@ async function startTarskServerInternal(options2) {
   const { isDebug: isDebug2, publicDir: publicDirOverride } = options2;
   const isRender = process.env.RENDER === "true";
   const initialPort = resolveInitialServerPort(isDebug2);
+  const isDevMode = isTarskDevelopmentMode({ isDebug: isDebug2 });
   const app = new Hono2();
   app.use("/*", cors());
   app.use("/*", async (c, next) => {
@@ -459518,7 +460390,7 @@ async function startTarskServerInternal(options2) {
   const processingStateManager = new ProcessingStateManagerImpl({
     recordConversationProcessingStart(threadId, conversationId, startedAt) {
       void getDatabase().then((db) => recordConversationProcessingStart(db, threadId, conversationId, startedAt)).catch((error2) => {
-        log159.warn("Failed to record conversation processing start", {
+        log160.warn("Failed to record conversation processing start", {
           error: error2,
           threadId,
           conversationId
@@ -459527,14 +460399,14 @@ async function startTarskServerInternal(options2) {
     },
     onConversationProcessingCleared(threadId, conversationId) {
       void handleConversationProcessingCleared(threadId, conversationId).catch((error2) => {
-        log159.warn("Failed to deliver Cross-project reply", {
+        log160.warn("Failed to deliver Cross-project reply", {
           error: error2,
           threadId,
           conversationId
         });
       });
       void flushBackgroundSubagentWakes(threadId, conversationId).catch(function(error2) {
-        log159.warn("Failed to wake parent after background subagent", {
+        log160.warn("Failed to wake parent after background subagent", {
           error: error2,
           threadId,
           conversationId
@@ -459585,6 +460457,9 @@ async function startTarskServerInternal(options2) {
   await initializeLoggingSettings();
   await clearInterruptedTaskWorkingFlags();
   activeTaskSchedulerTimer = startTaskScheduler(taskExecutionDeps);
+  if (process.env.VITEST !== "true") {
+    activePrMergedScannerTimer = startPrMergedScanner({ metadataManager, processingStateManager });
+  }
   registerShutdownSignalHandlers();
   let listeningPort = initialPort;
   registerLocalServerBaseUrl(() => `http://127.0.0.1:${listeningPort}`);
@@ -459593,7 +460468,7 @@ async function startTarskServerInternal(options2) {
       status: "ok",
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       service: "project-threads-manager-cli",
-      isDevMode: listeningPort !== initialPort
+      isDevMode
     });
   });
   app.get("/api/programs", (c) => {
@@ -459723,6 +460598,7 @@ async function startTarskServerInternal(options2) {
     initialPort,
     bunWebSocketSupport,
     injectNodeWebSocket,
+    isDevMode,
     onListening
   });
   registerProcessExitHandler();
@@ -459735,7 +460611,7 @@ function writePortFile(port, url2) {
     fs25.writeFileSync(portFilePath, `${JSON.stringify({ port, url: url2 }, null, 2)}
 `, "utf8");
   } catch (error2) {
-    log159.warn("Failed to write port.json", { error: error2 });
+    log160.warn("Failed to write port.json", { error: error2 });
   }
 }
 async function listenForTarskServer(options2) {
@@ -459781,7 +460657,7 @@ async function listenForTarskServer(options2) {
     port += 1;
   }
 }
-var log159, __filename2, __dirname4, SERVER_IDLE_TIMEOUT_SECONDS, startPromise, activeServerStops, activePtySessionManager, activeProcessingStateManager, activeTaskSchedulerTimer, signalHandlersRegistered, PROCESS_EXIT_HANDLER;
+var log160, __filename2, __dirname4, SERVER_IDLE_TIMEOUT_SECONDS, startPromise, activeServerStops, activePtySessionManager, activeProcessingStateManager, activeTaskSchedulerTimer, activePrMergedScannerTimer, signalHandlersRegistered, PROCESS_EXIT_HANDLER;
 var init_server2 = __esm({
   "src/server.ts"() {
     "use strict";
@@ -459793,6 +460669,7 @@ var init_server2 = __esm({
     init_open();
     init_agent_executor();
     init_agent_processing_state_manager();
+    init_dev_mode();
     init_env_manager();
     init_conversation_processing_state();
     init_paths();
@@ -459846,6 +460723,7 @@ var init_server2 = __esm({
     init_voice_model_routes();
     init_logs_routes();
     init_task_scheduler();
+    init_pr_merged_scanner();
     init_task_execution();
     init_task_launcher();
     init_cross_project_deps();
@@ -459861,7 +460739,7 @@ var init_server2 = __esm({
     init_cli_process_registry();
     init_dev_server_cache();
     init_script_process_manager();
-    log159 = createLogger("server");
+    log160 = createLogger("server");
     __filename2 = fileURLToPath7(import.meta.url);
     __dirname4 = path24.dirname(__filename2);
     SERVER_IDLE_TIMEOUT_SECONDS = 255;
@@ -459870,6 +460748,7 @@ var init_server2 = __esm({
     activePtySessionManager = null;
     activeProcessingStateManager = null;
     activeTaskSchedulerTimer = null;
+    activePrMergedScannerTimer = null;
     signalHandlersRegistered = false;
     PROCESS_EXIT_HANDLER = /* @__PURE__ */ Symbol.for("tarsk.server.processExitHandler");
   }