@staff0rd/assist 0.548.0 → 0.549.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.548.0",
+  version: "0.549.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -3421,6 +3421,312 @@ function isBicepFile(filePath) {
   return BICEP_EXTENSIONS.some((ext) => filePath.endsWith(ext));
 }
 
+// src/shared/isCsharpFile.ts
+var CSHARP_EXTENSIONS = [".cs", ".csx"];
+function isCsharpFile(filePath) {
+  if (!filePath) return false;
+  return CSHARP_EXTENSIONS.some((ext) => filePath.endsWith(ext));
+}
+
+// src/shared/isGeneratedCsharpFile.ts
+var GENERATED_SUFFIXES = [".g.cs", ".designer.cs"];
+var BUILD_OUTPUT_DIR = /(^|[/\\])obj[/\\]/;
+var AUTO_GENERATED_MARKER = "<auto-generated";
+var HEADER_LINES = 10;
+function hasAutoGeneratedHeader(content) {
+  return content.split("\n", HEADER_LINES).some((line) => line.toLowerCase().includes(AUTO_GENERATED_MARKER));
+}
+function isGeneratedCsharpFile(filePath, content) {
+  if (!isCsharpFile(filePath) || !filePath) return false;
+  const lower = filePath.toLowerCase();
+  if (GENERATED_SUFFIXES.some((suffix) => lower.endsWith(suffix))) return true;
+  if (BUILD_OUTPUT_DIR.test(lower)) return true;
+  return content !== void 0 && hasAutoGeneratedHeader(content);
+}
+
+// src/shared/isRazorFile.ts
+var RAZOR_EXTENSIONS = [".razor", ".cshtml"];
+function isRazorFile(filePath) {
+  if (!filePath) return false;
+  return RAZOR_EXTENSIONS.some((ext) => filePath.endsWith(ext));
+}
+
+// src/shared/lineCounter.ts
+function lineCounter(content) {
+  let scanned = 0;
+  let line = 1;
+  return (offset) => {
+    for (; scanned < offset; scanned++) {
+      if (content[scanned] === "\n") line++;
+    }
+    return line;
+  };
+}
+
+// src/shared/readRazorComment.ts
+var RAZOR_OPEN = "@*";
+var RAZOR_CLOSE = "*@";
+var HTML_OPEN = "<!--";
+var HTML_CLOSE = "-->";
+function read(content, index3, open, close) {
+  const found = content.indexOf(close, index3 + open.length);
+  const end = found === -1 ? content.length : found + close.length;
+  return { end, text: content.slice(index3, end) };
+}
+function readRazorComment(content, index3) {
+  if (content.startsWith(RAZOR_OPEN, index3))
+    return read(content, index3, RAZOR_OPEN, RAZOR_CLOSE);
+  if (content.startsWith(HTML_OPEN, index3))
+    return read(content, index3, HTML_OPEN, HTML_CLOSE);
+  return void 0;
+}
+
+// src/shared/skipCsharpCharLiteral.ts
+var CHAR_LITERAL_MAX_LENGTH = 12;
+function skipCsharpCharLiteral(content, index3) {
+  const limit = Math.min(content.length, index3 + CHAR_LITERAL_MAX_LENGTH);
+  let cursor = index3 + 1;
+  while (cursor < limit) {
+    const char = content[cursor];
+    if (char === "\n") break;
+    if (char === "\\") {
+      cursor += 2;
+      continue;
+    }
+    if (char === "'") return cursor + 1;
+    cursor++;
+  }
+  return index3 + 1;
+}
+
+// src/shared/readCsharpStringStart.ts
+function readCsharpStringStart(content, index3) {
+  let cursor = index3;
+  let verbatim = false;
+  let interpolated = false;
+  while (content[cursor] === "@" || content[cursor] === "$") {
+    if (content[cursor] === "@") verbatim = true;
+    else interpolated = true;
+    cursor++;
+  }
+  if (content[cursor] !== '"') return void 0;
+  let quoteRun = 0;
+  while (content[cursor + quoteRun] === '"') quoteRun++;
+  return { quote: cursor, verbatim, interpolated, quoteRun };
+}
+
+// src/shared/skipCsharpRawString.ts
+function skipCsharpRawString(content, quote, quoteRun) {
+  let cursor = quote + quoteRun;
+  while (cursor < content.length) {
+    if (content[cursor] !== '"') {
+      cursor++;
+      continue;
+    }
+    let run4 = 0;
+    while (content[cursor + run4] === '"') run4++;
+    if (run4 >= quoteRun) return cursor + run4;
+    cursor += run4;
+  }
+  return content.length;
+}
+
+// src/shared/skipCsharpString.ts
+function skipInterpolationHole(content, index3) {
+  let cursor = index3;
+  let depth = 1;
+  while (cursor < content.length) {
+    const char = content[cursor];
+    if (char === "{") depth++;
+    else if (char === "}" && --depth === 0) return cursor + 1;
+    else if (char === "'") {
+      cursor = skipCsharpCharLiteral(content, cursor);
+      continue;
+    } else {
+      const nested = skipCsharpString(content, cursor);
+      if (nested !== void 0) {
+        cursor = nested;
+        continue;
+      }
+    }
+    cursor++;
+  }
+  return content.length;
+}
+function skipDelimitedString(content, start3) {
+  const { quote, verbatim, interpolated } = start3;
+  let cursor = quote + 1;
+  while (cursor < content.length) {
+    const char = content[cursor];
+    if (char === "\\" && !verbatim) cursor += 2;
+    else if (char === "\n" && !verbatim) return cursor;
+    else if (char === '"') {
+      if (!verbatim || content[cursor + 1] !== '"') return cursor + 1;
+      cursor += 2;
+    } else if (interpolated && char === "{")
+      cursor = content[cursor + 1] === "{" ? cursor + 2 : skipInterpolationHole(content, cursor + 1);
+    else cursor++;
+  }
+  return content.length;
+}
+function skipCsharpString(content, index3) {
+  const start3 = readCsharpStringStart(content, index3);
+  if (!start3) return void 0;
+  if (!start3.verbatim && start3.quoteRun >= 3)
+    return skipCsharpRawString(content, start3.quote, start3.quoteRun);
+  return skipDelimitedString(content, start3);
+}
+
+// src/shared/stepRazorCode.ts
+function stepRazorCode(content, index3) {
+  const char = content[index3];
+  if (char === "{") return { next: index3 + 1, depthChange: 1 };
+  if (char === "}") return { next: index3 + 1, depthChange: -1 };
+  if (char === "'")
+    return { next: skipCsharpCharLiteral(content, index3), depthChange: 0 };
+  const afterString = skipCsharpString(content, index3);
+  return { next: afterString ?? index3 + 1, depthChange: 0 };
+}
+
+// src/shared/readRazorCodeBlockStart.ts
+var CODE_KEYWORDS = ["code", "functions"];
+var WHITESPACE = /* @__PURE__ */ new Set([" ", "	", "\r", "\n"]);
+function readRazorCodeBlockStart(content, index3) {
+  if (content[index3] !== "@") return void 0;
+  let cursor = index3 + 1;
+  const keyword = CODE_KEYWORDS.find(
+    (word) => content.startsWith(word, cursor)
+  );
+  if (keyword) {
+    cursor += keyword.length;
+    while (WHITESPACE.has(content[cursor] ?? "")) cursor++;
+  }
+  return content[cursor] === "{" ? cursor + 1 : void 0;
+}
+
+// src/shared/skipHtmlTag.ts
+var TAG_NAME_START = /[A-Za-z/]/;
+function skipHtmlTag(content, index3) {
+  if (content[index3] !== "<") return void 0;
+  if (!TAG_NAME_START.test(content[index3 + 1] ?? "")) return void 0;
+  let cursor = index3 + 1;
+  while (cursor < content.length) {
+    const char = content[cursor];
+    if (char === '"' || char === "'") {
+      const close = content.indexOf(char, cursor + 1);
+      if (close === -1) return void 0;
+      cursor = close + 1;
+    } else if (char === ">") return cursor + 1;
+    else cursor++;
+  }
+  return void 0;
+}
+
+// src/shared/skipRawTextElement.ts
+var RAW_TEXT_TAGS = ["script", "style"];
+var TAG_NAME_END = /[^A-Za-z0-9-]/;
+function openedTag(content, tagStart, tagEnd) {
+  if (content.slice(tagStart, tagEnd).endsWith("/>")) return "";
+  const name = content.slice(tagStart + 1, tagEnd).toLowerCase();
+  return RAW_TEXT_TAGS.find(
+    (tag) => name.startsWith(tag) && TAG_NAME_END.test(name[tag.length] ?? ">")
+  ) ?? "";
+}
+function skipRawTextElement(content, tagStart, tagEnd) {
+  const tag = openedTag(content, tagStart, tagEnd);
+  if (!tag) return tagEnd;
+  const close = new RegExp(`</${tag}`, "i").exec(content.slice(tagEnd));
+  return close ? tagEnd + close.index : tagEnd;
+}
+
+// src/shared/skipRazorExpression.ts
+var IDENT_START = /[A-Za-z_]/;
+var IDENT_PART = /[A-Za-z0-9_]/;
+var GROUP_CLOSE = { "(": ")", "[": "]" };
+function skipGroup(content, index3) {
+  const open = content[index3];
+  const close = GROUP_CLOSE[open];
+  let cursor = index3 + 1;
+  let depth = 1;
+  while (cursor < content.length) {
+    const char = content[cursor];
+    if (char === open) depth++;
+    else if (char === close && --depth === 0) return cursor + 1;
+    else if (char === "'") {
+      cursor = skipCsharpCharLiteral(content, cursor);
+      continue;
+    } else {
+      const afterString = skipCsharpString(content, cursor);
+      if (afterString !== void 0) {
+        cursor = afterString;
+        continue;
+      }
+    }
+    cursor++;
+  }
+  return void 0;
+}
+function skipRazorExpression(content, index3) {
+  if (content[index3] !== "@") return void 0;
+  const first = content[index3 + 1] ?? "";
+  if (!IDENT_START.test(first) && !GROUP_CLOSE[first]) return void 0;
+  let cursor = index3 + 1;
+  while (cursor < content.length) {
+    const char = content[cursor];
+    if (IDENT_PART.test(char)) cursor++;
+    else if (char === "." && IDENT_START.test(content[cursor + 1] ?? ""))
+      cursor++;
+    else if (GROUP_CLOSE[char]) {
+      const afterGroup = skipGroup(content, cursor);
+      if (afterGroup === void 0) return cursor;
+      cursor = afterGroup;
+    } else break;
+  }
+  return cursor;
+}
+
+// src/shared/stepRazorMarkup.ts
+function stepRazorMarkup(content, index3) {
+  const blockBody = readRazorCodeBlockStart(content, index3);
+  if (blockBody !== void 0) return { next: blockBody, enteredCode: true };
+  const expressionEnd = skipRazorExpression(content, index3);
+  if (expressionEnd !== void 0)
+    return { next: expressionEnd, enteredCode: false };
+  const tagEnd = skipHtmlTag(content, index3);
+  const next3 = tagEnd === void 0 ? index3 + 1 : skipRawTextElement(content, index3, tagEnd);
+  return { next: next3, enteredCode: false };
+}
+
+// src/shared/extractRazorComments.ts
+function extractRazorComments(content) {
+  const comments3 = [];
+  const lineOf = lineCounter(content);
+  let index3 = 0;
+  let codeDepth = 0;
+  while (index3 < content.length) {
+    if (content[index3] === "@" && content[index3 + 1] === "@") {
+      index3 += 2;
+      continue;
+    }
+    const comment3 = readRazorComment(content, index3);
+    if (comment3) {
+      comments3.push({ line: lineOf(index3), text: comment3.text });
+      index3 = comment3.end;
+      continue;
+    }
+    if (codeDepth > 0) {
+      const step3 = stepRazorCode(content, index3);
+      codeDepth += step3.depthChange;
+      index3 = step3.next;
+      continue;
+    }
+    const step2 = stepRazorMarkup(content, index3);
+    if (step2.enteredCode) codeDepth = 1;
+    index3 = step2.next;
+  }
+  return comments3;
+}
+
 // src/commands/verify/blockCodeComments/collectBicepComments.ts
 function blankNonNewline(text17) {
   return text17.replace(/[^\n]/g, " ");
@@ -3444,6 +3750,84 @@ function collectBicepComments(content) {
   return comments3;
 }
 
+// src/shared/csharpHeaderLineCount.ts
+function closesBlock(trimmed, from) {
+  return trimmed.includes("*/", from);
+}
+function csharpHeaderLineCount(content) {
+  const lines2 = content.split("\n");
+  let count8 = 0;
+  let inBlock = false;
+  while (count8 < lines2.length) {
+    const trimmed = lines2[count8].trim();
+    if (inBlock) {
+      inBlock = !closesBlock(trimmed, 0);
+    } else if (trimmed.startsWith("/*")) {
+      inBlock = !closesBlock(trimmed, 2);
+    } else if (trimmed !== "" && !trimmed.startsWith("//")) {
+      break;
+    }
+    count8++;
+  }
+  return count8;
+}
+
+// src/shared/readCsharpComment.ts
+function readCsharpComment(content, index3) {
+  if (content[index3] !== "/") return void 0;
+  if (content[index3 + 1] === "/") {
+    const lineEnd = content.indexOf("\n", index3);
+    const end = lineEnd === -1 ? content.length : lineEnd;
+    return { end, text: content.slice(index3, end) };
+  }
+  if (content[index3 + 1] === "*") {
+    const close = content.indexOf("*/", index3 + 2);
+    const end = close === -1 ? content.length : close + 2;
+    return { end, text: content.slice(index3, end) };
+  }
+  return void 0;
+}
+
+// src/shared/extractCsharpComments.ts
+var WHITESPACE2 = /* @__PURE__ */ new Set([" ", "	", "\r"]);
+function extractCsharpComments(content) {
+  const comments3 = [];
+  const lineOf = lineCounter(content);
+  let index3 = 0;
+  let atLineStart = true;
+  while (index3 < content.length) {
+    const char = content[index3];
+    if (char === "\n") {
+      atLineStart = true;
+      index3++;
+    } else if (WHITESPACE2.has(char)) {
+      index3++;
+    } else if (atLineStart && char === "#") {
+      const lineEnd = content.indexOf("\n", index3);
+      index3 = lineEnd === -1 ? content.length : lineEnd;
+    } else {
+      atLineStart = false;
+      const comment3 = readCsharpComment(content, index3);
+      const afterString = comment3 ? void 0 : skipCsharpString(content, index3);
+      if (comment3) {
+        comments3.push({ line: lineOf(index3), text: comment3.text });
+        index3 = comment3.end;
+      } else if (char === "'") index3 = skipCsharpCharLiteral(content, index3);
+      else if (afterString !== void 0) index3 = afterString;
+      else index3++;
+    }
+  }
+  return comments3;
+}
+
+// src/commands/verify/blockCodeComments/collectCsharpComments.ts
+function collectCsharpComments(content) {
+  const headerLines = csharpHeaderLineCount(content);
+  return extractCsharpComments(content).filter(
+    (comment3) => comment3.line > headerLines
+  );
+}
+
 // src/commands/verify/blockCodeComments/collectHashComments.ts
 function blankNonNewline2(text17) {
   return text17.replace(/[^\n]/g, " ");
@@ -3521,6 +3905,10 @@ var MACHINE_DIRECTIVES = [
   "v8 ignore",
   "c8 ignore",
   "@vitest-environment",
+  "resharper disable",
+  "resharper restore",
+  "noinspection",
+  "<auto-generated",
   MAINTAINABILITY_OVERRIDE_MARKER
 ];
 function isCommentExempt(text17) {
@@ -3556,7 +3944,7 @@ function collectYamlComments(content) {
   return comments3;
 }
 
-// src/commands/verify/blockCodeComments/collectFileComments.ts
+// src/commands/verify/blockCodeComments/toFindings.ts
 function toFindings(file, lines2, raw, exempt) {
   const findings = [];
   for (const { line, text: text17 } of raw) {
@@ -3566,19 +3954,28 @@ function toFindings(file, lines2, raw, exempt) {
   }
   return findings;
 }
+
+// src/commands/verify/blockCodeComments/collectFileComments.ts
 function collectFileComments(file, lines2, project) {
-  const read = () => fs14.readFileSync(file, "utf8");
+  const read2 = () => fs14.readFileSync(file, "utf8");
   if (isYamlFile(file))
-    return toFindings(file, lines2, collectYamlComments(read()), false);
+    return toFindings(file, lines2, collectYamlComments(read2()), false);
   if (isDockerfile(file) || isEnvFile(file) || isShellFile(file))
     return toFindings(
       file,
       lines2,
-      collectHashComments(read(), { skipHeader: isShellFile(file) }),
+      collectHashComments(read2(), { skipHeader: isShellFile(file) }),
       true
     );
   if (isBicepFile(file))
-    return toFindings(file, lines2, collectBicepComments(read()), true);
+    return toFindings(file, lines2, collectBicepComments(read2()), true);
+  if (isCsharpFile(file)) {
+    const content = read2();
+    if (isGeneratedCsharpFile(file, content)) return [];
+    return toFindings(file, lines2, collectCsharpComments(content), true);
+  }
+  if (isRazorFile(file))
+    return toFindings(file, lines2, extractRazorComments(read2()), true);
   return collectSourceFindings(file, lines2, project);
 }
 
@@ -3628,7 +4025,11 @@ var SCANNED_EXTENSIONS = [
   ".yml",
   ".yaml",
   ".bicep",
-  ".bicepparam"
+  ".bicepparam",
+  ".cs",
+  ".csx",
+  ".razor",
+  ".cshtml"
 ];
 function shouldScan(file, ignoreGlobs) {
   if (!SCANNED_EXTENSIONS.some((ext) => file.endsWith(ext)) && !isHashCommentFile(file))
@@ -19177,6 +19578,58 @@ function registerDotnet(program2) {
 // src/commands/editHook/index.ts
 import fs23 from "fs";
 
+// src/commands/editHook/introducedComments.ts
+function introducedComments(added, removed) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const comment3 of removed) {
+    counts.set(comment3, (counts.get(comment3) ?? 0) + 1);
+  }
+  const candidates = [];
+  for (const comment3 of added) {
+    const remaining = counts.get(comment3) ?? 0;
+    if (remaining > 0) counts.set(comment3, remaining - 1);
+    else candidates.push(comment3);
+  }
+  const removedWords = new Set(removed.flatMap(commentWords));
+  return candidates.filter((comment3) => {
+    const words = commentWords(comment3);
+    if (words.length === 0) return true;
+    return !words.every((word) => removedWords.has(word));
+  });
+}
+function commentWords(comment3) {
+  return comment3.toLowerCase().split(/[^a-z0-9]+/).filter((word) => word.length > 0);
+}
+
+// src/commands/editHook/partitionStrings.ts
+function defined(values) {
+  return values.filter((value) => value != null);
+}
+function partitionStrings(input, existingContent) {
+  const { tool_name, tool_input } = input;
+  switch (tool_name) {
+    case "Edit":
+      return {
+        added: defined([tool_input.new_string]),
+        removed: defined([tool_input.old_string])
+      };
+    case "MultiEdit": {
+      const edits = tool_input.edits ?? [];
+      return {
+        added: defined(edits.map((e) => e.new_string)),
+        removed: defined(edits.map((e) => e.old_string))
+      };
+    }
+    case "Write":
+      return {
+        added: defined([tool_input.content]),
+        removed: defined([existingContent])
+      };
+    default:
+      return { added: [], removed: [] };
+  }
+}
+
 // src/commands/editHook/extractComments.ts
 var SOURCE_EXTENSIONS = [
   ".ts",
@@ -19213,6 +19666,21 @@ function extractComments(text17) {
   return comments3.map((comment3) => comment3.replace(/\s+/g, " ").trim()).filter((comment3) => comment3.length > 0).filter((comment3) => !isCommentExempt(comment3));
 }
 
+// src/commands/editHook/commentTexts.ts
+function commentTexts(comments3) {
+  return comments3.map((comment3) => comment3.text.replace(/\s+/g, " ").trim()).filter((comment3) => comment3.length > 0).filter((comment3) => !isCommentExempt(comment3));
+}
+
+// src/commands/editHook/extractCsharpCommentTexts.ts
+function extractCsharpCommentTexts(text17) {
+  return commentTexts(extractCsharpComments(text17));
+}
+
+// src/commands/editHook/extractRazorCommentTexts.ts
+function extractRazorCommentTexts(text17) {
+  return commentTexts(extractRazorComments(text17));
+}
+
 // src/commands/editHook/extractYamlComments.ts
 function blankNonNewline4(text17) {
   return text17.replace(/[^\n]/g, " ");
@@ -19243,27 +19711,19 @@ function extractShellComments(text17) {
   return extractYamlComments(lines2.slice(firstCodeLine).join("\n"));
 }
 
-// src/commands/editHook/introducedComments.ts
-function introducedComments(added, removed) {
-  const counts = /* @__PURE__ */ new Map();
-  for (const comment3 of removed) {
-    counts.set(comment3, (counts.get(comment3) ?? 0) + 1);
-  }
-  const candidates = [];
-  for (const comment3 of added) {
-    const remaining = counts.get(comment3) ?? 0;
-    if (remaining > 0) counts.set(comment3, remaining - 1);
-    else candidates.push(comment3);
-  }
-  const removedWords = new Set(removed.flatMap(commentWords));
-  return candidates.filter((comment3) => {
-    const words = commentWords(comment3);
-    if (words.length === 0) return true;
-    return !words.every((word) => removedWords.has(word));
-  });
-}
-function commentWords(comment3) {
-  return comment3.toLowerCase().split(/[^a-z0-9]+/).filter((word) => word.length > 0);
+// src/commands/editHook/selectCommentExtractor.ts
+function selectCommentExtractor(filePath) {
+  if (isHashCommentFile(filePath))
+    return {
+      extract: isShellFile(filePath) ? extractShellComments : extractYamlComments,
+      marker: "#"
+    };
+  if (isCsharpFile(filePath))
+    return { extract: extractCsharpCommentTexts, marker: "//" };
+  if (isRazorFile(filePath))
+    return { extract: extractRazorCommentTexts, marker: "//" };
+  if (isSourceFile(filePath)) return { extract: extractComments, marker: "//" };
+  return void 0;
 }
 
 // src/commands/editHook/decideCommentGuard.ts
@@ -19271,44 +19731,17 @@ function denyReason(marker) {
   const blockClause = marker === "//" ? ", no block comments" : "";
   return `This edit introduces a code comment (${marker}), which is blocked by the comment gate. Comments are a last resort \u2014 prefer a clearer name, a smaller function, or a test that makes the comment unnecessary. The comment must not appear in your edit itself. If this one line genuinely earns its keep, use the escape hatch: run \`assist code-comment set <file> <line> "<text>"\` (single line, max 50 chars${blockClause}) to get a pin, then \`assist code-comment confirm <pin>\` to insert it.`;
 }
-function defined(values) {
-  return values.filter((value) => value != null);
-}
-function partitionStrings(input, existingContent) {
-  const { tool_name, tool_input } = input;
-  switch (tool_name) {
-    case "Edit":
-      return {
-        added: defined([tool_input.new_string]),
-        removed: defined([tool_input.old_string])
-      };
-    case "MultiEdit": {
-      const edits = tool_input.edits ?? [];
-      return {
-        added: defined(edits.map((e) => e.new_string)),
-        removed: defined(edits.map((e) => e.old_string))
-      };
-    }
-    case "Write":
-      return {
-        added: defined([tool_input.content]),
-        removed: defined([existingContent])
-      };
-    default:
-      return { added: [], removed: [] };
-  }
-}
 function decideCommentGuard(input, existingContent) {
-  const filePath = input.tool_input.file_path;
-  const hash = isHashCommentFile(filePath);
-  if (!isSourceFile(filePath) && !hash) return void 0;
-  const extract2 = hash ? isShellFile(filePath) ? extractShellComments : extractYamlComments : extractComments;
+  const { file_path, content } = input.tool_input;
+  if (isGeneratedCsharpFile(file_path, content)) return void 0;
+  const gate = selectCommentExtractor(file_path);
+  if (!gate) return void 0;
   const { added, removed } = partitionStrings(input, existingContent);
   const introduced = introducedComments(
-    added.flatMap(extract2),
-    removed.flatMap(extract2)
+    added.flatMap(gate.extract),
+    removed.flatMap(gate.extract)
   );
-  return introduced.length > 0 ? denyReason(hash ? "#" : "//") : void 0;
+  return introduced.length > 0 ? denyReason(gate.marker) : void 0;
 }
 
 // src/commands/dbMigration/consumeMigrationApproval.ts
@@ -31730,7 +32163,7 @@ function watchActivity(session, notify2, onClaudeSessionId) {
   }
   reconcileActivity(session.id, session.activity);
   let timer = null;
-  const read = () => {
+  const read2 = () => {
     timer = null;
     const activity2 = readActivity(path73);
     if (!activity2) return;
@@ -31743,9 +32176,9 @@ function watchActivity(session, notify2, onClaudeSessionId) {
   session.activityWatcher = watch2(dir, (_event, filename) => {
     if (filename && !path73.endsWith(filename)) return;
     if (timer) clearTimeout(timer);
-    timer = setTimeout(read, DEBOUNCE_MS2);
+    timer = setTimeout(read2, DEBOUNCE_MS2);
   });
-  if (existsSync75(path73)) read();
+  if (existsSync75(path73)) read2();
 }
 function refreshActivity(session) {
   if (session.commandType !== "assist" || !session.cwd) return;
@@ -33573,7 +34006,7 @@ function allocateAndBind(ctx, cwd, create, options2 = {}, context) {
 }
 
 // src/commands/sessions/daemon/worktree/ensureWatcher.ts
-function ensureWatcher(ctx, cwd, launchedFrom) {
+function ensureWatcher(ctx, cwd) {
   if (!cwd) return void 0;
   const repoRoot2 = findRepoRoot(cwd) ?? cwd;
   const cfg = worktreeConfigFor(repoRoot2);
@@ -33590,8 +34023,7 @@ function ensureWatcher(ctx, cwd, launchedFrom) {
     ctx,
     clone,
     (sid, resolvedCwd) => createWatcherSession(sid, resolvedCwd ?? clone),
-    { inPlace: true },
-    { launchedFrom }
+    { inPlace: true }
   );
   daemonLog(
     `spawned watcher session ${id} running /watch in the clone ${clone}`
@@ -33689,7 +34121,7 @@ function reuseSessionForRun(session, itemId2, clients, onStatusChange, tree) {
     onStatusChange
   );
   if (!started) return;
-  if (tree) ensureWatcher(tree, originCwd, session.id);
+  if (tree) ensureWatcher(tree, originCwd);
   attachReusedRun(session, alloc, clients, onStatusChange, tree);
   daemonLog(
     `session ${session.id} reused for backlog run ${itemId2}: ${session.name}`
@@ -34647,7 +35079,7 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta, context) {
     },
     context
   );
-  if (isBacklogRunArgs(assistArgs)) ensureWatcher(ctx, cwd, id);
+  if (isBacklogRunArgs(assistArgs)) ensureWatcher(ctx, cwd);
   return id;
 }
 function resumeInTree(ctx, sessionId, cwd, name) {