@adhdev/daemon-core 0.9.82-rc.328 → 0.9.82-rc.329

package/src/git/git-status.ts

@@ -1,6 +1,13 @@
 import type { DaemonBuildBehind, GitRepoStatus, GitSubmoduleStatus, GitUpstreamFreshness } from './git-types.js';
 import { GIT_STATUS_TIMEOUT_MS, GitCommandError, resolveGitRepository, runGit } from './git-executor.js';
 import { getDaemonBuildInfo, type DaemonBuildInfo } from '../build-info.js';
+import {
+  type ChangeImpactConfig,
+  type ChangeImpactKind,
+  type ChangeImpactTarget,
+  globToRegExp,
+  loadChangeImpactConfig,
+} from './change-impact-config.js';
 
 type ResolvedGitRepo = { workspace: string; repoRoot: string | null; isGitRepo: boolean };
 
@@ -12,9 +19,42 @@ type ResolvedGitRepo = { workspace: string; repoRoot: string | null; isGitRepo:
  */
 const lastKnownGoodStatus = new Map<string, GitRepoStatus>();
 
+/**
+ * Memoized Change Impact evaluation, keyed by the inputs that can change the
+ * verdict: the scope repo path, the buildCommit..HEAD pair, and the resolved
+ * config source. The daemonBuildBehind probe runs on every mesh_status /
+ * mesh_git_status / fast_forward / git-monitor hit; without this, each hit
+ * re-shells `git diff` for the identical commit range. The cache stays correct
+ * because HEAD or a config edit perturbs the key, forcing re-evaluation.
+ */
+interface ChangeImpactEvalEntry {
+  isDaemonAffecting: boolean;
+  affectedPackages: string[];
+}
+const changeImpactEvalCache = new Map<string, ChangeImpactEvalEntry>();
+
+/**
+ * Best-effort cache of the loaded Change Impact config per repo root, keyed by the
+ * config sourceKey (path+mtime). A new sourceKey (config edited/added/removed)
+ * supersedes the entry. Avoids re-reading + re-parsing the config file on every
+ * status probe while still honoring on-disk edits.
+ */
+interface ChangeImpactConfigCacheEntry {
+  sourceKey: string;
+  config: ChangeImpactConfig | null;
+}
+const changeImpactConfigCache = new Map<string, ChangeImpactConfigCacheEntry>();
+
 /** Test seam: clear the last-known-good status cache between cases. */
 export function __resetGitStatusCacheForTests(): void {
   lastKnownGoodStatus.clear();
+  changeImpactEvalCache.clear();
+  changeImpactConfigCache.clear();
+}
+
+/** Test-only introspection: number of memoized Change Impact evaluations. */
+export function __changeImpactEvalCacheSizeForTests(): number {
+  return changeImpactEvalCache.size;
 }
 
 /**
@@ -43,6 +83,17 @@ export interface GitStatusOptions {
    * (getDaemonBuildInfo) is used.
    */
   daemonBuildInfo?: DaemonBuildInfo;
+  /**
+   * Change Impact policy override. When provided, the daemonBuildBehind
+   * classifier uses this declarative config instead of auto-loading the repo's
+   * `.adhdev/change-impact.*` file. When omitted, getGitRepoStatus auto-loads the
+   * repo config (cached); when neither is present the built-in ADHDev default
+   * policy applies, preserving the legacy behavior exactly.
+   *
+   * Pass `null` to force the built-in default policy and skip auto-loading (used
+   * to assert legacy parity in tests).
+   */
+  changeImpactConfig?: ChangeImpactConfig | null;
 }
 
 interface GitUpstreamProbe {
@@ -177,7 +228,7 @@ async function collectGitRepoStatus(
  * same process surface as the daemon tooling, so it is classified as
  * daemon-affecting (conservative). Unknown package → daemon-affecting.
  */
-const DAEMON_RUNTIME_PACKAGES = new Set([
+const DEFAULT_DAEMON_RUNTIME_PACKAGES = [
   'daemon-core',
   'daemon-standalone',
   'session-host-core',
@@ -187,14 +238,66 @@ const DAEMON_RUNTIME_PACKAGES = new Set([
   'terminal-mux-cli',
   'ghostty-vt-node',
   'mcp-server',
-]);
+];
 
-const WEB_ONLY_PACKAGES = new Set([
+const DEFAULT_WEB_ONLY_PACKAGES = [
   'web-core',
   'web-standalone',
   'web-devconsole',
   'terminal-render-web',
-]);
+];
+
+/**
+ * Built-in recommended action/command per impact classification. A change-impact
+ * config may override any of these via `impactTargets`; missing keys fall back here.
+ */
+const DEFAULT_IMPACT_TARGETS: Record<ChangeImpactKind, ChangeImpactTarget> = {
+  daemon: {
+    recommendedCommand: 'Redeploy + restart the daemon (a local dist rebuild alone does not update a cloud daemon).',
+  },
+  web: {
+    recommendedCommand: 'Redeploy the web app (no daemon restart required).',
+  },
+  none: {
+    recommendedCommand: 'No action required.',
+  },
+};
+
+/**
+ * The resolved Change Impact policy: the built-in ADHDev defaults merged with any
+ * config override. This is what the classifier consults — git-status only knows the
+ * facts (changed files/packages), policy is data.
+ */
+interface ResolvedChangeImpactPolicy {
+  daemonRuntimePackages: Set<string>;
+  webOnlyPackages: Set<string>;
+  /** Compiled config globs for additional non-runtime root files (on top of built-ins). */
+  nonRuntimeRootFilePatterns: RegExp[];
+  impactTargets: Record<ChangeImpactKind, ChangeImpactTarget>;
+}
+
+function resolveChangeImpactPolicy(config: ChangeImpactConfig | null | undefined): ResolvedChangeImpactPolicy {
+  // A field provided in config REPLACES the built-in default for that field; an
+  // omitted field falls back to the ADHDev default, so a repo with no config (or a
+  // partial config) behaves exactly as before.
+  const daemonRuntimePackages = new Set(
+    config?.daemonRuntimePackages && config.daemonRuntimePackages.length
+      ? config.daemonRuntimePackages
+      : DEFAULT_DAEMON_RUNTIME_PACKAGES,
+  );
+  const webOnlyPackages = new Set(
+    config?.webOnlyPackages && config.webOnlyPackages.length
+      ? config.webOnlyPackages
+      : DEFAULT_WEB_ONLY_PACKAGES,
+  );
+  const nonRuntimeRootFilePatterns = (config?.nonRuntimeRootFilePatterns || []).map(globToRegExp);
+  const impactTargets: Record<ChangeImpactKind, ChangeImpactTarget> = {
+    daemon: config?.impactTargets?.daemon ?? DEFAULT_IMPACT_TARGETS.daemon,
+    web: config?.impactTargets?.web ?? DEFAULT_IMPACT_TARGETS.web,
+    none: config?.impactTargets?.none ?? DEFAULT_IMPACT_TARGETS.none,
+  };
+  return { daemonRuntimePackages, webOnlyPackages, nonRuntimeRootFilePatterns, impactTargets };
+}
 
 /**
  * Root-level (non-package) files that demonstrably cannot change what the daemon
@@ -210,8 +313,11 @@ const WEB_ONLY_PACKAGES = new Set([
  * real-world case (e.g. `.verify-patch-equiv-rc292`), so they are matched broadly;
  * docs are matched by the `docs/` prefix or a markdown/text-doc extension at a
  * filename we recognize as documentation (README/CHANGELOG/LICENSE/NOTICE).
+ *
+ * Config-supplied `nonRuntimeRootFilePatterns` are matched in ADDITION to these
+ * built-ins, so a repo can extend (never narrow) the benign set declaratively.
  */
-function isNonRuntimeRootFile(file: string): boolean {
+function isNonRuntimeRootFile(file: string, policy: ResolvedChangeImpactPolicy): boolean {
   const base = file.slice(file.lastIndexOf('/') + 1);
   // Verify/convergence markers: dotfiles whose name signals a transient marker.
   if (/^\.(?:verify|marker|converge|ff-verify|patch-equiv|live-verify)\b/i.test(base)) return true;
@@ -221,19 +327,24 @@ function isNonRuntimeRootFile(file: string): boolean {
   if (/^(?:README|CHANGELOG|LICENSE|NOTICE|AUTHORS|CONTRIBUTING|CODEOWNERS)(?:\.[A-Za-z0-9]+)?$/i.test(base)) {
     return true;
   }
+  // Config-declared additional non-runtime root globs.
+  for (const re of policy.nonRuntimeRootFilePatterns) {
+    if (re.test(file)) return true;
+  }
   return false;
 }
 
 /**
  * Determine whether the changes between buildCommit..HEAD touch any daemon-runtime
- * package. Returns isDaemonAffecting:true conservatively when the changed-file set
- * can't be obtained or any changed path is outside the known web-only package set
- * AND is not a recognized non-runtime root file (marker/doc/license).
+ * package, per the resolved policy. Returns isDaemonAffecting:true conservatively
+ * when the changed-file set can't be obtained or any changed path is outside the
+ * known web-only package set AND is not a recognized non-runtime root file.
  */
 async function classifyDaemonBuildChange(
   repoPath: string,
   buildCommit: string,
   options: GitStatusOptions,
+  policy: ResolvedChangeImpactPolicy,
 ): Promise<{ isDaemonAffecting: boolean; affectedPackages: string[] }> {
   try {
     const diff = await runGit(repoPath, ['diff', '--name-only', `${buildCommit}..HEAD`], options);
@@ -254,7 +365,7 @@ async function classifyDaemonBuildChange(
     for (const file of files) {
       const match = file.match(/(?:^|\/)packages\/([^/]+)\//);
       if (!match) {
-        if (!isNonRuntimeRootFile(file)) sawRuntimeAmbiguousNonPackage = true;
+        if (!isNonRuntimeRootFile(file, policy)) sawRuntimeAmbiguousNonPackage = true;
         continue;
       }
       pkgs.add(match[1]);
@@ -267,7 +378,7 @@ async function classifyDaemonBuildChange(
     // file changed) — i.e. nothing runtime-ambiguous remains.
     const allBenign =
       !sawRuntimeAmbiguousNonPackage &&
-      affectedPackages.every((p) => WEB_ONLY_PACKAGES.has(p) && !DAEMON_RUNTIME_PACKAGES.has(p));
+      affectedPackages.every((p) => policy.webOnlyPackages.has(p) && !policy.daemonRuntimePackages.has(p));
     return { isDaemonAffecting: !allBenign, affectedPackages };
   } catch {
     // diff probe failed → can't prove web-only; stay conservative.
@@ -275,6 +386,46 @@ async function classifyDaemonBuildChange(
   }
 }
 
+/**
+ * Resolve the Change Impact config to apply for this status read. Priority:
+ *   - options.changeImpactConfig === null → force built-in default policy (no load).
+ *   - options.changeImpactConfig provided → use it verbatim (override seam).
+ *   - otherwise → auto-load the repo's `.adhdev/change-impact.*` (cached by sourceKey).
+ * Returns the (possibly null) config plus the sourceKey used for cache invalidation.
+ */
+function resolveChangeImpactConfigForRepo(
+  repoRoot: string | null,
+  options: GitStatusOptions,
+): { config: ChangeImpactConfig | null; sourceKey: string } {
+  if (options.changeImpactConfig === null) {
+    return { config: null, sourceKey: 'forced-default' };
+  }
+  if (options.changeImpactConfig !== undefined) {
+    // Injected override — key it to its content so a different injected config
+    // re-evaluates rather than reusing a prior verdict.
+    let key = 'injected';
+    try {
+      key = `injected:${JSON.stringify(options.changeImpactConfig)}`;
+    } catch {
+      // Non-serializable override (shouldn't happen) — fall back to a constant key.
+    }
+    return { config: options.changeImpactConfig, sourceKey: key };
+  }
+  if (!repoRoot) {
+    return { config: null, sourceKey: 'no-repo-root' };
+  }
+  const loaded = loadChangeImpactConfig(repoRoot);
+  const cached = changeImpactConfigCache.get(repoRoot);
+  if (cached && cached.sourceKey === loaded.sourceKey) {
+    return { config: cached.config, sourceKey: loaded.sourceKey };
+  }
+  // An invalid config is conservatively ignored (built-in default policy applies),
+  // mirroring the "fail safe" rule — never let a malformed config silence warnings.
+  const config = loaded.sourceType === 'repo_file' ? loaded.config ?? null : null;
+  changeImpactConfigCache.set(repoRoot, { sourceKey: loaded.sourceKey, config });
+  return { config, sourceKey: loaded.sourceKey };
+}
+
 async function detectDaemonBuildBehind(
   repo: ResolvedGitRepo,
   submodules: GitSubmoduleStatus[] | undefined,
@@ -283,6 +434,9 @@ async function detectDaemonBuildBehind(
   const build = options.daemonBuildInfo ?? getDaemonBuildInfo();
   if (!build.commit || build.commit === 'unknown') return undefined;
 
+  const { config, sourceKey: configKey } = resolveChangeImpactConfigForRepo(repo.repoRoot, options);
+  const policy = resolveChangeImpactPolicy(config);
+
   // Check the root repo first, then each submodule. The daemon build commit is
   // baked from the daemon-core (oss submodule) HEAD, so on an adhdev
   // superproject worktree the match is expected on the `oss` submodule, not the
@@ -307,12 +461,22 @@ async function detectDaemonBuildBehind(
       // Inspect WHICH packages changed in buildCommit..HEAD. A daemon rebuild/restart
       // is only actually required when a daemon-runtime package changed; if only web /
       // render packages changed, the daemon is unaffected and just the web deploy is
-      // pending. Conservative: any probe failure → treat as daemon-affecting.
-      const { isDaemonAffecting, affectedPackages } = await classifyDaemonBuildChange(
-        repoPath,
-        build.commit,
-        options,
-      );
+      // pending. Conservative: any probe failure → treat as daemon-affecting. The
+      // verdict is memoized on (repoPath, buildCommit, head, config) to suppress
+      // re-evaluation on the hot status path.
+      const evalKey = `${repoPath}${build.commit}${head}${configKey}`;
+      let evaluated = changeImpactEvalCache.get(evalKey);
+      if (!evaluated) {
+        evaluated = await classifyDaemonBuildChange(repoPath, build.commit, options, policy);
+        changeImpactEvalCache.set(evalKey, evaluated);
+      }
+      const { isDaemonAffecting, affectedPackages } = evaluated;
+      const kind: ChangeImpactKind = isDaemonAffecting
+        ? 'daemon'
+        : affectedPackages.length > 0
+          ? 'web'
+          : 'none';
+      const target = policy.impactTargets[kind];
       const scopeLabel = scope === 'root' ? 'workspace' : scope;
       const benignDetail = affectedPackages.length > 0
         ? `only web packages changed (${affectedPackages.join(', ')})`
@@ -330,6 +494,8 @@ async function detectDaemonBuildBehind(
         scope,
         isDaemonAffecting,
         ...(affectedPackages && affectedPackages.length > 0 ? { affectedPackages } : {}),
+        recommendedAction: kind,
+        recommendedCommand: target.recommendedCommand,
         warning,
       };
     } catch {

package/src/git/index.ts

@@ -26,6 +26,22 @@ export type { GitCommandResult as GitExecutorCommandResult, GitExecutorOptions,
 export { getGitRepoStatus, parsePorcelainV2Status } from './git-status.js';
 export type { GitStatusOptions } from './git-status.js';
 
+export {
+  CHANGE_IMPACT_CONFIG_LOCATIONS,
+  CHANGE_IMPACT_CONFIG_SCHEMA,
+  globToRegExp,
+  loadChangeImpactConfig,
+  suggestChangeImpactConfig,
+  validateChangeImpactConfig,
+} from './change-impact-config.js';
+export type {
+  ChangeImpactConfig,
+  ChangeImpactConfigLoadResult,
+  ChangeImpactConfigSuggestion,
+  ChangeImpactKind,
+  ChangeImpactTarget,
+} from './change-impact-config.js';
+
 export { getGitDiffSummary, getGitFileDiff } from './git-diff.js';
 export type { GitDiffOptions, GitFileDiffResult } from './git-diff.js';
 

package/src/mesh/mesh-events-coordinator.ts

@@ -21,7 +21,7 @@ import {
     findRecentTerminalLedgerEvidence,
     hasDispatchAfterTerminal,
     hasUnterminalDirectDispatchLedgerEntry,
-    buildLongGeneratingCompletionReconciliation,
+    buildNoProgressCompletionReconciliation,
 } from './mesh-events-stale.js';
 import {
     buildMeshSystemMessage,
@@ -125,7 +125,7 @@ function shouldSuppressIntentionalCleanupStop(args: {
     sessionId?: string;
     nodeId?: string;
 }): boolean {
-    if (args.event !== 'agent:stopped' && args.event !== 'monitor:long_generating') return false;
+    if (args.event !== 'agent:stopped' && args.event !== 'monitor:no_progress') return false;
     if (isIntentionalCleanupStopMetadata(args.metadataEvent)) return true;
     return hasRecentIntentionalCleanupStop(args.meshId, args.sessionId, args.nodeId);
 }
@@ -453,7 +453,8 @@ function resolveAutoFastForwardPolicy(mesh: any): { enabled: boolean; maxBehind?
 function sessionStateLooksActive(state: any): boolean {
     const status = readNonEmptyString(state?.status).toLowerCase();
     const chatStatus = readNonEmptyString(state?.activeChat?.status).toLowerCase();
-    const active = new Set(['generating', 'streaming', 'long_generating', 'working', 'starting', 'waiting_approval']);
+    // 'long_generating' is retained as a legacy alias for the renamed 'no_progress' busy status.
+    const active = new Set(['generating', 'streaming', 'no_progress', 'long_generating', 'working', 'starting', 'waiting_approval']);
     return active.has(status) || active.has(chatStatus);
 }
 
@@ -1329,7 +1330,7 @@ const MESH_COORDINATOR_EVENTS = new Set([
     'agent:waiting_approval',
     'agent:stopped',
     'agent:ready',
-    'monitor:long_generating',
+    'monitor:no_progress',
     'refine:accepted',
     'refine:completed',
     'refine:failed',
@@ -1341,7 +1342,7 @@ const EVENT_TO_LEDGER_KIND: Record<string, MeshLedgerKind> = {
     'agent:generating_completed': 'task_completed',
     'agent:waiting_approval': 'task_approval_needed',
     'agent:stopped': 'task_failed',
-    'monitor:long_generating': 'task_stalled',
+    'monitor:no_progress': 'task_stalled',
 };
 
 export function isMeshCoordinatorEvent(eventName: unknown): eventName is string {
@@ -1419,24 +1420,24 @@ function injectMeshSystemMessage(components: DaemonComponents, args: {
         return { success: true, forwarded: 0, suppressed: true, intentionalCleanupStop: true };
     }
 
-    if (args.event === 'monitor:long_generating') {
-        const reconciledCompletion = buildLongGeneratingCompletionReconciliation({
+    if (args.event === 'monitor:no_progress') {
+        const reconciledCompletion = buildNoProgressCompletionReconciliation({
             meshId: args.meshId,
             nodeId: args.nodeId,
             nodeLabel: args.nodeLabel,
             metadataEvent: args.metadataEvent,
             sourceInstanceId: args.sourceInstanceId,
         });
-        if (reconciledCompletion?.source === 'long_generating_reconciliation') {
-            LOG.info('MeshEvents', `Reconciled long-generating monitor to completion for session ${eventSessionId || '(unknown session)'}`);
+        if (reconciledCompletion?.source === 'no_progress_reconciliation') {
+            LOG.info('MeshEvents', `Reconciled no-progress monitor to completion for session ${eventSessionId || '(unknown session)'}`);
             return injectMeshSystemMessage(components, {
                 ...args,
                 event: 'agent:generating_completed',
                 metadataEvent: reconciledCompletion,
             });
         }
-        if (reconciledCompletion?.source === 'long_generating_terminal_ledger_suppression') {
-            LOG.info('MeshEvents', `Suppressed long-generating monitor because terminal ledger evidence already exists for session ${eventSessionId || '(unknown session)'}`);
+        if (reconciledCompletion?.source === 'no_progress_terminal_ledger_suppression') {
+            LOG.info('MeshEvents', `Suppressed no-progress monitor because terminal ledger evidence already exists for session ${eventSessionId || '(unknown session)'}`);
             return {
                 success: true,
                 forwarded: 0,
@@ -1483,7 +1484,7 @@ function injectMeshSystemMessage(components: DaemonComponents, args: {
                 if (
                     (terminalProviderSessionId && terminalProviderSessionId === eventProviderSessionId)
                     || (terminalFinalSummary && terminalFinalSummary === eventFinalSummary)
-                    || args.metadataEvent.source === 'long_generating_reconciliation'
+                    || args.metadataEvent.source === 'no_progress_reconciliation'
                 ) {
                     LOG.info('MeshEvents', `Suppressed duplicate completion with existing terminal ledger evidence for mesh ${args.meshId} session ${eventSessionId}`);
                     return { success: true, forwarded: 0, suppressed: true, duplicateCompletion: true, terminalLedgerEvidence: true };

package/src/mesh/mesh-events-stale.ts

@@ -235,7 +235,7 @@ export function reconcileDirectDispatchCompletionFromTranscript(args: {
     return { reconciled: true, kind, workerResult, ledgerEntryId: entry.id };
 }
 
-export function buildLongGeneratingCompletionReconciliation(args: {
+export function buildNoProgressCompletionReconciliation(args: {
     meshId: string;
     nodeId?: string;
     nodeLabel: string;
@@ -265,8 +265,8 @@ export function buildLongGeneratingCompletionReconciliation(args: {
             providerType,
             providerSessionId,
             finalSummary,
-            source: 'long_generating_reconciliation',
-            reconciledFromEvent: 'monitor:long_generating',
+            source: 'no_progress_reconciliation',
+            reconciledFromEvent: 'monitor:no_progress',
             timestamp: args.metadataEvent.timestamp ?? Date.now(),
             completionDiagnostic: {
                 ...(completionDiagnostic || {}),
@@ -283,7 +283,7 @@ export function buildLongGeneratingCompletionReconciliation(args: {
     if (!terminal) return null;
     return {
         ...args.metadataEvent,
-        source: 'long_generating_terminal_ledger_suppression',
+        source: 'no_progress_terminal_ledger_suppression',
         terminalLedgerKind: terminal.kind,
         terminalLedgerAt: terminal.timestamp,
     };

package/src/mesh/mesh-events-utils.ts

@@ -137,8 +137,8 @@ export function buildMeshSystemMessage(args: {
 }): string {
     const metadata = formatCompletionMetadata(args.metadataEvent);
     if (args.event === 'agent:generating_completed') {
-        if (args.metadataEvent.source === 'long_generating_reconciliation') {
-            return `[System] ${args.nodeLabel} already has completion evidence${metadata}. The long-generating monitor reconciled the terminal handoff and marked the session complete; wait for the queued completion event/status refresh before doing any manual transcript check.`;
+        if (args.metadataEvent.source === 'no_progress_reconciliation') {
+            return `[System] ${args.nodeLabel} already has completion evidence${metadata}. The no-progress monitor reconciled the terminal handoff and marked the session complete; wait for the queued completion event/status refresh before doing any manual transcript check.`;
         }
         const reviewNote = args.metadataEvent.reviewRecommended === true
             ? ' Completion evidence is insufficient — verify via git status or provider_session_id before assuming the task is done. Use mesh_read_chat once if needed, but do not poll repeatedly.'
@@ -173,7 +173,7 @@ export function buildMeshSystemMessage(args: {
         }
         return `[System] ${args.nodeLabel} has stopped${metadata}. Use mesh_read_chat once if you need to inspect its last output.`;
     }
-    if (args.event === 'monitor:long_generating') {
+    if (args.event === 'monitor:no_progress') {
         return `[System] ${args.nodeLabel} is still reported as generating after a long interval${metadata}. Wait for pendingCoordinatorEvents or a completion/status event; if the user explicitly asks for status, make one bounded status check and then wait again.`;
     }
     if (args.event === 'worktree_bootstrap_complete') {

package/src/providers/acp-provider-instance.ts

@@ -329,8 +329,8 @@ export class AcpProviderInstance implements ProviderInstance {
         this.settings = context.settings || {};
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
 
         await this.spawnAgent();
@@ -674,8 +674,8 @@ export class AcpProviderInstance implements ProviderInstance {
         this.settings = { ...this.settings, ...newSettings };
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
         this.log.info(`[${this.type}] Settings updated: ${Object.keys(newSettings).join(', ')}`);
     }
@@ -1533,7 +1533,8 @@ export class AcpProviderInstance implements ProviderInstance {
 
  // Monitor check
         const agentKey = `${this.type}:acp`;
-        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint);
+        const approvalPending = newStatus === 'waiting_approval';
+        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint, approvalPending);
         for (const me of monitorEvents) {
             this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }

package/src/providers/cli-provider-instance.ts

@@ -183,7 +183,7 @@ function hasNonEmptyCliModalButtons(activeModal: unknown): boolean {
 }
 
 function isCliGeneratingLikeStatus(status: unknown): boolean {
-    return status === 'generating' || status === 'streaming' || status === 'long_generating' || status === 'starting';
+    return status === 'generating' || status === 'streaming' || status === 'no_progress' || status === 'long_generating' || status === 'starting';
 }
 
 export function buildCliStructuredInputPrompt(
@@ -479,8 +479,8 @@ export class CliProviderInstance implements ProviderInstance {
         this.adapter.updateRuntimeSettings?.(this.settings);
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
 
  // Server connection
@@ -698,7 +698,7 @@ export class CliProviderInstance implements ProviderInstance {
                 && adapterStatus.status === 'idle'
                 && parsedStatus?.status === 'idle';
             let messagesToSave = parsedMessages;
-            if (!suppressStaleParsedBusyStatus && (parsedChatStatus === 'generating' || parsedChatStatus === 'long_generating')) {
+            if (!suppressStaleParsedBusyStatus && (parsedChatStatus === 'generating' || parsedChatStatus === 'no_progress' || parsedChatStatus === 'long_generating')) {
                 const lastIdx = messagesToSave.length - 1;
                 if (lastIdx >= 0 && messagesToSave[lastIdx]?.role === 'assistant') {
                     messagesToSave = messagesToSave.slice(0, lastIdx);
@@ -866,8 +866,8 @@ export class CliProviderInstance implements ProviderInstance {
         this.adapter.updateRuntimeSettings?.(this.settings);
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
     }
 
@@ -1545,7 +1545,7 @@ export class CliProviderInstance implements ProviderInstance {
         const dirName = workingDirBasename(this.workingDir);
         const chatTitle = `${this.provider.name} · ${dirName}`;
         const partial = this.adapter.getPartialResponse();
-        // Liveness fingerprint for the long-generating watchdog. The parsed
+        // Liveness fingerprint for the no-progress watchdog. The parsed
         // assistant buffer (`partial`) alone goes static while a tool/build runs
         // — the assistant emits no tokens even though the PTY is actively
         // printing tool output — which made the watchdog false-fire a "stuck"
@@ -1764,11 +1764,15 @@ export class CliProviderInstance implements ProviderInstance {
 
  // Monitor check (cooldown based notification, IDE/CLI common)
         const agentKey = `${this.type}:cli`;
-        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint);
+        // Approval pending is detected from the raw adapter status, not `newStatus`:
+        // auto-approve synthesizes `waiting_approval` → 'generating', which would
+        // otherwise let the no-progress watchdog accumulate the approval wait.
+        const approvalPending = rawStatus === 'waiting_approval';
+        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint, approvalPending);
         const monitorParsedStatus: any = parsedStatus;
         for (const me of monitorEvents) {
             if (
-                me.type === 'monitor:long_generating'
+                me.type === 'monitor:no_progress'
                 && this.completionHasFinalAssistantMessage(monitorParsedStatus?.messages)
                 && !this.hasAdapterPendingResponse()
                 && !hasNonEmptyCliModalButtons(monitorParsedStatus?.activeModal ?? monitorParsedStatus?.modal)
@@ -1783,7 +1787,7 @@ export class CliProviderInstance implements ProviderInstance {
                         providerType: this.type,
                         sessionId: this.instanceId,
                         providerSessionId: this.providerSessionId || null,
-                        reconciliationReason: 'long_generating_monitor_final_summary',
+                        reconciliationReason: 'no_progress_monitor_final_summary',
                         finalAssistantPresent: true,
                     },
                 });

package/src/providers/extension-provider-instance.ts

@@ -63,8 +63,8 @@ export class ExtensionProviderInstance implements ProviderInstance {
         this.settings = context.settings || {};
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
     }
 
@@ -178,8 +178,8 @@ export class ExtensionProviderInstance implements ProviderInstance {
         this.settings = { ...this.settings, ...newSettings };
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
     }
 
@@ -251,9 +251,10 @@ export class ExtensionProviderInstance implements ProviderInstance {
                 : 'immediate',
         });
 
- // Monitor check (cooldown based notification) — keep monitor events (long_generating etc)
+ // Monitor check (cooldown based notification) — keep monitor events (no_progress etc)
         const agentKey = `${this.type}:ext`;
-        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
+        const approvalPending = agentStatus === 'waiting_approval';
+        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint, approvalPending);
         for (const me of monitorEvents) {
             this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }

package/src/providers/ide-provider-instance.ts

@@ -105,8 +105,8 @@ export class IdeProviderInstance implements ProviderInstance {
  // Sync Monitor config
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
     }
 
@@ -267,8 +267,8 @@ export class IdeProviderInstance implements ProviderInstance {
         this.settings = { ...this.settings, ...newSettings };
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
     }
 
@@ -417,7 +417,7 @@ export class IdeProviderInstance implements ProviderInstance {
             const persistedMessages = chat.messages || messages;
             if (persistedMessages.length > 0) {
                 let toSave = persistedMessages;
-                if (chat.status === 'generating' || chat.status === 'long_generating') {
+                if (chat.status === 'generating' || chat.status === 'no_progress' || chat.status === 'long_generating') {
  // Find and exclude last assistant message
                     const lastIdx = toSave.length - 1;
                     if (lastIdx >= 0 && toSave[lastIdx].role === 'assistant') {
@@ -508,7 +508,11 @@ export class IdeProviderInstance implements ProviderInstance {
         }
 
  // Monitor check (cooldown based notification)
-        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
+        // Approval pending is detected from the raw status: auto-approve synthesizes
+        // `waiting_approval` → 'generating', so the no-progress watchdog must be told
+        // to hold its timer during the wait rather than count it as a stall.
+        const approvalPending = rawAgentStatus === 'waiting_approval';
+        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint, approvalPending);
         for (const me of monitorEvents) {
             this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }