npm - @hamp10/agentforge - Versions diffs - 0.2.31 → 0.2.33 - Mend

@hamp10/agentforge 0.2.31 → 0.2.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json +1 -1
package/scripts/check-task-semantics.js +34 -2
package/src/OpenClawCLI.js +135 -4
package/src/worker.js +129 -8

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@hamp10/agentforge",
-  "version": "0.2.31",
+  "version": "0.2.33",
   "description": "AgentForge worker — connect your machine to agentforge.ai",
   "type": "module",
   "bin": {

package/scripts/check-task-semantics.js CHANGED Viewed

@@ -437,6 +437,15 @@ try {
   );
   rmSync(sharedCssFile, { force: true });
   writeFileSync(alphaFixturePath, alphaFixtureCurrent);
+  const wrongRouteDir = path.join(fixture.repo, 'public_html', 'alpha');
+  mkdirSync(wrongRouteDir, { recursive: true });
+  writeFileSync(path.join(wrongRouteDir, 'index.html'), '<!doctype html><html><body><h1>Alpha</h1></body></html>');
+  assert.match(
+    worker._formatScopeDriftNudge(worker._findScopeDriftRepoChanges(baseline, message)),
+    /public_html\/alpha\/index\.html/i,
+    'new same-scope route folders should be reported as out-of-scope when the project already has a page collection'
+  );
+  rmSync(wrongRouteDir, { recursive: true, force: true });
   const directOldHtml = '<!doctype html><html><body><main><section class="hero"><h1>Alpha</h1><p>Existing body copy.</p></section></main></body></html>';
   const directInlineStyleHtml = '<!doctype html><html><body><main><section class="hero" style="padding: 4rem; color: white;"><h1>Alpha</h1><p>Existing body copy.</p></section></main></body></html>';
   assert.throws(
@@ -552,9 +561,18 @@ try {
       fixture.repo,
       { task: 'Work on the listing page for Alpha. Only change that listing page.' }
     ),
-    /existing scoped page target/i,
+    /existing (?:scoped page target|page collection)/i,
     'scoped page work should not create a new same-slug page when an existing scoped target page is present'
   );
+  assert.throws(
+    () => cli._guardDirectFileWritePath(
+      path.join(fixture.repo, 'public_html', 'alpha', 'index.html'),
+      fixture.repo,
+      { task: message }
+    ),
+    /existing page collection/i,
+    'scoped page work should not create a route folder when the project has an existing page collection pattern'
+  );
   const nestedDuplicateGamma = path.join(fixture.repo, path.basename(fixture.repo), 'public_html', 'domains', 'gamma.html');
   mkdirSync(path.dirname(nestedDuplicateGamma), { recursive: true });
   writeFileSync(nestedDuplicateGamma, '<!doctype html><html><body><h1>Gamma</h1></body></html>');
@@ -663,14 +681,28 @@ try {
     ),
     'scoped shell sed should ignore the substitution script and allow canonical target page edits'
   );
+  assert.throws(
+    () => cli._guardDirectBashCommand(
+      'touch public_html/css/domain-detail.css',
+      fixture.repo,
+      { task: message }
+    ),
+    /outside the requested task scope/i,
+    'direct scoped work should reject new generic CSS assets before the target page owns or links them'
+  );
+  writeFileSync(
+    alphaFixturePath,
+    alphaFixtureCurrent.replace('</head>', '<link rel="stylesheet" href="../css/domain-detail.css">\n</head>')
+  );
   assert.doesNotThrow(
     () => cli._guardDirectBashCommand(
       'touch public_html/css/domain-detail.css',
       fixture.repo,
       { task: message }
     ),
-    'direct scoped work should allow creating a new page-owned CSS asset before the target page links it'
+    'direct scoped work should allow generic CSS assets after they are linked only by scoped pages'
   );
+  writeFileSync(alphaFixturePath, alphaFixtureCurrent);
   const staleLinkedCssHtml = '<!doctype html><html><head><link rel="stylesheet" href="css/alpha.css"></head><body><main><section><h1>Alpha</h1><p>Fresh page body copy with rebuilt structure.</p></section></main></body></html>';
   assert.throws(
     () => cli._validateDirectUiFileContent(

package/src/OpenClawCLI.js CHANGED Viewed

@@ -617,12 +617,65 @@ export class OpenClawCLI extends EventEmitter {
     return /\.(?:html?|xhtml|astro|mdx?)$/i.test(String(relativePath || ''));
   }
-  _isDirectNewPageOwnedAssetPath(filePath, workDir, relativePath, pageOnly) {
+  _directFileMentionsAsset(content, sourceRel, assetRel) {
+    const source = String(content || '');
+    const assetUnix = String(assetRel || '').replace(/\\/g, '/');
+    const assetBase = path.basename(assetUnix);
+    const relativeFromSource = path.relative(path.dirname(sourceRel || ''), assetRel || '').replace(/\\/g, '/');
+    const candidates = [
+      assetBase,
+      assetUnix,
+      `/${assetUnix}`,
+      relativeFromSource,
+      relativeFromSource && !relativeFromSource.startsWith('.') ? `./${relativeFromSource}` : '',
+    ].filter(Boolean);
+    return candidates.some(candidate => source.includes(candidate));
+  }
+  _directCurrentPageSourceFiles(workDir) {
+    const names = new Set();
+    const addLines = (output) => {
+      for (const rel of String(output || '').split('\n').map(line => line.trim()).filter(Boolean)) {
+        if (this._isDirectPageSourcePath(rel)) names.add(rel);
+      }
+    };
+    try {
+      addLines(execFileSync('git', ['-C', workDir, 'ls-files'], {
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+      }));
+      addLines(execFileSync('git', ['-C', workDir, 'ls-files', '--others', '--exclude-standard'], {
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+      }));
+    } catch {}
+    return [...names].sort();
+  }
+  _isDirectNewPageOwnedAssetPath(filePath, workDir, relativePath, pageOnly, slugs = []) {
     if (!pageOnly || !this._isDirectPageAssetPath(relativePath)) return false;
-    if (existsSync(filePath)) return false;
     const relative = path.relative(workDir, filePath);
     if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) return false;
-    return true;
+    if (this._directScopeSlugsMatchingText(String(relativePath || '').toLowerCase(), slugs).length > 0) return true;
+    const sourceFiles = this._directCurrentPageSourceFiles(workDir).filter(file => file !== relativePath);
+    const scopedSources = [];
+    const outOfScopeMentions = [];
+    for (const sourceRel of sourceFiles) {
+      let content = '';
+      try {
+        content = readFileSync(path.join(workDir, sourceRel), 'utf-8');
+      } catch {
+        continue;
+      }
+      if (!this._directFileMentionsAsset(content, sourceRel, relativePath)) continue;
+      if (this._directScopeSlugsMatchingText(String(sourceRel || '').toLowerCase(), slugs).length > 0) {
+        scopedSources.push(sourceRel);
+      } else {
+        outOfScopeMentions.push(sourceRel);
+      }
+    }
+    return scopedSources.length > 0 && outOfScopeMentions.length === 0;
   }
   _isDirectScopedReferenceSourcePath(filePath, workDir, relativePath, slugs, pageOnly, task) {
@@ -659,11 +712,71 @@ export class OpenClawCLI extends EventEmitter {
     const slugAllowed = this._directScopeSlugsMatchingText(lower, slugs).length > 0;
     if (!slugAllowed) {
       if (this._isDirectScopedReferenceSourcePath(filePath, workDir, scopePath, slugs, pageOnly, task)) return true;
-      return this._isDirectNewPageOwnedAssetPath(filePath, workDir, scopePath, pageOnly);
+      return this._isDirectNewPageOwnedAssetPath(filePath, workDir, scopePath, pageOnly, slugs);
     }
     return !pageOnly || this._isDirectPageSourcePath(scopePath);
   }
+  _directHtmlPageCollectionDirs(workDir) {
+    if (!workDir) return [];
+    const counts = new Map();
+    try {
+      const output = execFileSync('git', ['-C', workDir, 'ls-files'], {
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+      });
+      for (const rel of String(output || '').split('\n').map(line => line.trim()).filter(Boolean)) {
+        if (!this._isDirectHtmlPagePath(rel)) continue;
+        const absolute = path.resolve(workDir, rel);
+        if (this._nestedProjectCopyCanonicalPath(absolute, workDir)) continue;
+        const dir = path.dirname(rel);
+        if (!dir || dir === '.') continue;
+        counts.set(dir, (counts.get(dir) || 0) + 1);
+      }
+    } catch {
+      return [];
+    }
+    const dirs = [...counts.entries()]
+      .filter(([, count]) => count >= 2)
+      .sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]))
+      .map(([dir]) => dir);
+    return dirs.filter(dir => !dirs.some(other => other !== dir && this._directPathInsideRelDir(other, dir)));
+  }
+  _directPathInsideRelDir(relativePath, dir) {
+    const rel = path.relative(path.normalize(dir), path.normalize(relativePath));
+    return rel === '' || (!!rel && !rel.startsWith('..') && !path.isAbsolute(rel));
+  }
+  _directNewHtmlPageCollectionViolation(filePath, workDir, slugs, pageOnly, relativePath) {
+    if (!pageOnly || !Array.isArray(slugs) || slugs.length === 0) return null;
+    if (!this._isDirectHtmlPagePath(relativePath)) return null;
+    const lowerRelativePath = String(relativePath || '').toLowerCase();
+    const matchedSlugs = this._directScopeSlugsMatchingText(lowerRelativePath, slugs);
+    if (matchedSlugs.length === 0) return null;
+    if (this._gitTracksExactPath(workDir, relativePath)) return null;
+    const collectionDirs = this._directHtmlPageCollectionDirs(workDir);
+    if (collectionDirs.length === 0) return null;
+    if (collectionDirs.some(dir => this._directPathInsideRelDir(relativePath, dir))) return null;
+    const candidatePaths = [];
+    for (const dir of collectionDirs.slice(0, 4)) {
+      for (const slug of matchedSlugs) {
+        const aliases = new Set([slug]);
+        const withoutSuffix = slug.replace(/-(?:ai|app|co|com|dev|gg|io|net|org|so|xyz)$/i, '');
+        if (withoutSuffix && withoutSuffix !== slug && withoutSuffix.length >= 3) aliases.add(withoutSuffix);
+        for (const alias of aliases) candidatePaths.push(path.join(dir, `${alias}.html`));
+      }
+    }
+    return {
+      requested: relativePath,
+      collectionDirs,
+      candidatePaths: [...new Set(candidatePaths)].slice(0, 8),
+    };
+  }
 	  _directScopeFileCandidates(workDir, slugs, maxResults = 8) {
 	    if (!workDir || !Array.isArray(slugs) || slugs.length === 0) return [];
 	    const results = [];
@@ -852,6 +965,24 @@ export class OpenClawCLI extends EventEmitter {
     if (!this._directTaskScopeAllowsPath(filePath, workDir, options.task)) {
       throw this._directScopeViolationError(this._formatDirectScopeError(filePath, workDir, options.task));
     }
+    const collectionViolation = this._directNewHtmlPageCollectionViolation(
+      filePath,
+      workDir,
+      slugs,
+      pageOnly,
+      relativePath
+    );
+    if (collectionViolation) {
+      throw this._directScopeViolationError([
+        'Refusing to create a new route/page path outside the project\'s existing page collection for this scoped page task.',
+        `Requested new page: ${collectionViolation.requested}`,
+        `Existing page collection director${collectionViolation.collectionDirs.length === 1 ? 'y' : 'ies'}: ${collectionViolation.collectionDirs.slice(0, 6).join(', ')}`,
+        collectionViolation.candidatePaths.length > 0
+          ? `Likely target path(s): ${collectionViolation.candidatePaths.join(', ')}`
+          : '',
+        'Use the project\'s existing page collection pattern instead of inventing a sibling URL or route folder.',
+      ].filter(Boolean).join(' '));
+    }
     if (pageOnly && slugs.length > 0 && this._isDirectHtmlPagePath(relativePath)) {
       const matchedSlugs = this._directScopeSlugsMatchingText(lowerRelativePath, slugs);
       const isTrackedTarget = this._gitTracksExactPath(workDir, relativePath);

package/src/worker.js CHANGED Viewed

@@ -646,6 +646,47 @@ export class AgentForgeWorker extends EventEmitter {
     return /\.(css|scss|sass|less|jsx?|tsx?)$/i.test(String(relativePath || ''));
   }
+  _isHtmlPagePath(relativePath) {
+    return /\.(?:html?|xhtml|astro|mdx?)$/i.test(String(relativePath || ''));
+  }
+  _htmlPageCollectionDirs(repo, ref = 'HEAD') {
+    if (!repo) return [];
+    const counts = new Map();
+    const output = this._gitOutput(repo, ['ls-tree', '-r', '--name-only', ref || 'HEAD'], 50000)
+      || this._gitOutput(repo, ['ls-files'], 50000);
+    for (const rel of String(output || '').split('\n').map(line => line.trim()).filter(Boolean)) {
+      if (!this._isHtmlPagePath(rel)) continue;
+      const parts = rel.split(/[\\/]+/).filter(Boolean);
+      if (parts.length >= 2 && parts[0].toLowerCase() === path.basename(repo).toLowerCase()) continue;
+      const dir = path.dirname(rel);
+      if (!dir || dir === '.') continue;
+      counts.set(dir, (counts.get(dir) || 0) + 1);
+    }
+    const dirs = [...counts.entries()]
+      .filter(([, count]) => count >= 2)
+      .sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]))
+      .map(([dir]) => dir);
+    return dirs.filter(dir => !dirs.some(other => other !== dir && this._pathInsideRelDir(other, dir)));
+  }
+  _pathInsideRelDir(relativePath, dir) {
+    const rel = path.relative(path.normalize(dir), path.normalize(relativePath));
+    return rel === '' || (!!rel && !rel.startsWith('..') && !path.isAbsolute(rel));
+  }
+  _isNewHtmlPageOutsideExistingCollection(baseline, rel, allowedSlugs, pageOnly) {
+    if (!baseline?.root || !pageOnly || !this._isHtmlPagePath(rel)) return false;
+    if (!Array.isArray(allowedSlugs) || allowedSlugs.length === 0) return false;
+    const lower = String(rel || '').toLowerCase();
+    if (this._scopeSlugsMatchingText(lower, allowedSlugs).length === 0) return false;
+    if (this._gitPathExistsAtRef(baseline.root, baseline.head || 'HEAD', rel)) return false;
+    const collectionDirs = this._htmlPageCollectionDirs(baseline.root, baseline.head || 'HEAD');
+    if (collectionDirs.length === 0) return false;
+    return !collectionDirs.some(dir => this._pathInsideRelDir(rel, dir));
+  }
   _fileMentionsAsset(content, sourceRel, assetRel) {
     const source = String(content || '');
     const assetUnix = String(assetRel || '').replace(/\\/g, '/');
@@ -723,7 +764,10 @@ export class AgentForgeWorker extends EventEmitter {
   _scopeAllowsChangedPath(baseline, rel, allowedSlugs, pageOnly, userMessage = '') {
     const lower = String(rel || '').toLowerCase();
     const slugAllowed = this._scopeSlugsMatchingText(lower, allowedSlugs).length > 0;
-    if (slugAllowed) return !pageOnly || this._isPageSourcePath(rel);
+    if (slugAllowed) {
+      if (this._isNewHtmlPageOutsideExistingCollection(baseline, rel, allowedSlugs, pageOnly)) return false;
+      return !pageOnly || this._isPageSourcePath(rel);
+    }
     if (this._isScopedReferenceSourcePath(baseline, rel, allowedSlugs, pageOnly, userMessage)) return true;
     return this._isNewScopedPageOwnedAsset(baseline, rel, allowedSlugs, pageOnly);
   }
@@ -810,11 +854,8 @@ export class AgentForgeWorker extends EventEmitter {
       addLines(this._gitOutput(baseline.root, ['diff', '--name-only'], 10000));
       addLines(this._gitOutput(baseline.root, ['diff', '--name-only', '--cached'], 10000));
       addLines(this._gitOutput(baseline.root, ['ls-files', '--others', '--exclude-standard'], 10000));
-      const status = this._gitStatusPorcelain(baseline.root, 10000);
-      for (const rawLine of String(status || '').split('\n').filter(Boolean)) {
-        const rel = rawLine.length >= 3 && rawLine[2] === ' ' ? rawLine.slice(3) : rawLine.trim().replace(/^..\s+/, '');
-        const pathName = rel.includes(' -> ') ? rel.split(' -> ').pop() : rel;
-        if (pathName) names.add(pathName);
+      for (const pathName of this._parseGitStatusPaths(this._gitStatusPorcelain(baseline.root, 10000))) {
+        names.add(pathName);
       }
       const initialDirty = new Set(baseline.initialDirtyPaths || []);
@@ -846,6 +887,45 @@ export class AgentForgeWorker extends EventEmitter {
     return restored;
   }
+  _restoreGeneratedScopedUiTargets(repoBaselines, userMessage) {
+    if (!this._isBroadUiQualityTask(userMessage)) return [];
+    if (!Array.isArray(repoBaselines) || repoBaselines.length === 0) return [];
+    const { slugs: allowedSlugs, pageOnly } = this._extractExplicitScope(userMessage);
+    if (allowedSlugs.length === 0 || !pageOnly) return [];
+    const restored = [];
+    for (const baseline of repoBaselines) {
+      const names = new Set();
+      const addLines = (output) => {
+        for (const rel of String(output || '').split('\n').map(line => line.trim()).filter(Boolean)) {
+          names.add(rel);
+        }
+      };
+      addLines(this._gitOutput(baseline.root, ['diff', '--name-only'], 10000));
+      addLines(this._gitOutput(baseline.root, ['diff', '--name-only', '--cached'], 10000));
+      addLines(this._gitOutput(baseline.root, ['ls-files', '--others', '--exclude-standard'], 10000));
+      for (const pathName of this._parseGitStatusPaths(this._gitStatusPorcelain(baseline.root, 10000))) {
+        names.add(pathName);
+      }
+      const initialDirty = new Set(baseline.initialDirtyPaths || []);
+      const files = [...names]
+        .filter(rel => !initialDirty.has(rel))
+        .filter(rel => this._scopeAllowsChangedPath(baseline, rel, allowedSlugs, pageOnly, userMessage))
+        .filter(rel => !this._gitPathExistsAtRef(baseline.root, baseline.head || 'HEAD', rel))
+        .sort();
+      if (files.length === 0) continue;
+      this._gitRun(baseline.root, ['restore', '--staged', '--', ...files], 10000);
+      const untracked = files.filter(file => this._gitOutput(baseline.root, ['ls-files', '--others', '--exclude-standard', '--', file], 5000));
+      if (untracked.length > 0) {
+        this._gitRun(baseline.root, ['clean', '-fd', '--', ...untracked], 10000);
+      }
+      restored.push({ repo: baseline.root, files: files.slice(0, 12), restoredCount: files.length });
+    }
+    return restored;
+  }
   _formatScopeDriftRestoreNudge(restored) {
     const lines = restored.slice(0, 5).flatMap(w => [
       `- ${w.repo}: restored ${w.restoredCount} out-of-scope file(s); allowed scope tokens: ${w.allowedSlugs.join(', ')}${w.pageOnly ? ' (page/source files only)' : ''}`,
@@ -1250,6 +1330,19 @@ export class AgentForgeWorker extends EventEmitter {
     ].join('\n');
   }
+  _formatGeneratedScopedUiResetNudge(restored) {
+    if (!Array.isArray(restored) || restored.length === 0) return '';
+    const lines = restored.slice(0, 5).flatMap(item => [
+      `- ${item.repo}: removed ${item.restoredCount} rejected generated scoped file(s) before retrying`,
+      ...item.files.map(file => `    ${file}`),
+    ]);
+    return [
+      'AgentForge removed the rejected generated target file(s) before this retry.',
+      ...lines,
+      'Treat those removed files as failed output, not source material. Rebuild the requested target page-owned file(s) from inspected project context and comparable existing pages, then verify the rebuilt pages visually.',
+    ].join('\n');
+  }
   _findUiImplementationArtifactChanges(repoBaselines, userMessage) {
     if (!this._isBroadUiQualityTask(userMessage)) return [];
     if (!Array.isArray(repoBaselines) || repoBaselines.length === 0) return [];
@@ -3425,6 +3518,20 @@ export class AgentForgeWorker extends EventEmitter {
       // generic discovery loop after the user has steered the active task.
       const withTaskContext = (message) => activeGuidePrefix() + retryContextPrefix + taskContextPrefix + message;
       finalMessage = withTaskContext(finalMessage);
+      const applyGuideToSemanticScope = (guideText) => {
+        const text = String(guideText || '').trim();
+        if (!text) return;
+        const before = this._extractExplicitScope(scopeAwareUserMessage);
+        const merged = `${scopeAwareUserMessage}\n\n[Active user guide]\n${text}`;
+        const after = this._extractExplicitScope(merged);
+        if (after.slugs.length === 0) return;
+        scopeAwareUserMessage = merged;
+        const beforeKey = `${before.slugs.join(',')}|${before.pageOnly}`;
+        const afterKey = `${after.slugs.join(',')}|${after.pageOnly}`;
+        if (beforeKey !== afterKey) {
+          agentLog(`[${taskId}] 🎯 Updated active scope from guide: ${after.slugs.join(', ')}${after.pageOnly ? ' (page/source files only)' : ''}`);
+        }
+      };
       // If conversation history was loaded from DB (e.g. session expired, worker restarted,
       // or user returning hours later), prepend it so the agent has full context.
@@ -3750,6 +3857,7 @@ export class AgentForgeWorker extends EventEmitter {
           nudgeCount = 0;
           uiRepairNudgeCount = 0;
           uiVerificationRetryCount = 0;
+          applyGuideToSemanticScope(preRunGuide.text);
           agentLog(`[${taskId}] 🧭 Applying ${preRunGuide.count} guide note(s) before iteration ${iteration}`);
           this.send({ type: 'task_progress', taskId, agentId, roomId, output: 'Guide received; applying it to the current task...' });
           iterationMessage = `${preRunGuide.text}\n\n${iterationMessage}`;
@@ -4068,6 +4176,7 @@ export class AgentForgeWorker extends EventEmitter {
           nudgeCount = 0;
           uiRepairNudgeCount = 0;
           uiVerificationRetryCount = 0;
+          applyGuideToSemanticScope(postRunGuide.text);
           agentLog(`[${taskId}] 🧭 Applying ${postRunGuide.count} guide note(s) after iteration ${iteration}`);
           this.send({ type: 'task_progress', taskId, agentId, roomId, output: 'Guide received; continuing with the updated direction...' });
           iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\n${postRunGuide.text}\n\nContinue with the active task using the guide as the newest user direction. Preserve useful work and context only when it does not conflict with the guide.`);
@@ -4515,9 +4624,15 @@ export class AgentForgeWorker extends EventEmitter {
               throw new Error('UI task failed visual verification after repeated repair attempts');
             }
             const repairBudget = consumeUiRepairNudge('visual verification warnings', visualVerificationFailureNudge);
+            const generatedResetNudge = this._formatGeneratedScopedUiResetNudge(
+              this._restoreGeneratedScopedUiTargets(repoBaselines, scopeAwareUserMessage)
+            );
             nudgeCount = 0;
             console.log(`[${taskId}] UI task visual verification still reported visible issues — retrying (${uiVerificationRetryCount}/${UI_REPAIR_NUDGE_LIMIT}, total UI repairs ${repairBudget})`);
-            iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\n${visualVerificationFailureNudge}\n\nContinue from the current changed files and latest browser evidence. Do not restart from scratch. Fix the visible issues reported by the local browser verification, reopen each edited target screen locally after the final edit, and only then end with ✓ TASK_COMPLETE.`);
+            const retryInstruction = generatedResetNudge
+              ? 'Rebuild the removed target page file(s) from already-inspected project context and comparable existing pages. Do not reuse the rejected generated page as the basis for the next attempt. Fix the visible issues reported by local browser verification, reopen each edited target screen locally after the final edit, and only then end with ✓ TASK_COMPLETE.'
+              : 'Continue from the current changed files and latest browser evidence. Fix the visible issues reported by the local browser verification, reopen each edited target screen locally after the final edit, and only then end with ✓ TASK_COMPLETE.';
+            iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\n${[visualVerificationFailureNudge, generatedResetNudge].filter(Boolean).join('\n\n')}\n\n${retryInstruction}`);
           } else if (hasMissingLocalUiVerification) {
             uiVerificationRetryCount++;
             const uiVerificationFailureDetails = this._extractUiVerificationFailureDetails(output);
@@ -4526,9 +4641,15 @@ export class AgentForgeWorker extends EventEmitter {
               throw new Error('UI task failed visual verification after repeated repair attempts');
             }
             const repairBudget = consumeUiRepairNudge('missing local visual verification', uiVerificationFailureDetails);
+            const generatedResetNudge = this._formatGeneratedScopedUiResetNudge(
+              this._restoreGeneratedScopedUiTargets(repoBaselines, scopeAwareUserMessage)
+            );
             nudgeCount = 0;
             console.log(`[${taskId}] UI task missing local visual verification — retrying with local-app repair instruction (${uiVerificationRetryCount}/${UI_REPAIR_NUDGE_LIMIT}, total UI repairs ${repairBudget})`);
-            iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\nYour edits are not complete because the changed UI was not successfully loaded and inspected cleanly in its actual local app URL.${uiVerificationFailureDetails ? `\n\nSpecific verification issue(s):\n${uiVerificationFailureDetails}` : ''}\n\nContinue from the current changed files and already-inspected project context. Do not restart from scratch, repeat initial delete/reset/setup steps, discard existing progress, or reread site indexes, shared/global CSS, header/footer partials, or unrelated reference pages unless a specific verification issue requires it. Do not use external sites, site indexes, listing indexes, shared style files, or reference pages as final verification for scoped UI edits. Start or repair the project's local dev/static server if needed, use the port the project actually declares, open the real localhost/127.0.0.1 URL for each edited target screen, inspect the changed screen, fix visible issues, and only then end with ✓ TASK_COMPLETE.`);
+            const retryInstruction = generatedResetNudge
+              ? 'Rebuild the removed target page file(s) from already-inspected project context and comparable existing pages. Do not reuse the rejected generated page as the basis for the next attempt.'
+              : 'Continue from the current changed files and already-inspected project context. Do not restart from scratch, repeat initial delete/reset/setup steps, discard existing progress, or reread site indexes, shared/global CSS, header/footer partials, or unrelated reference pages unless a specific verification issue requires it.';
+            iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\nYour edits are not complete because the changed UI was not successfully loaded and inspected cleanly in its actual local app URL.${uiVerificationFailureDetails ? `\n\nSpecific verification issue(s):\n${uiVerificationFailureDetails}` : ''}${generatedResetNudge ? `\n\n${generatedResetNudge}` : ''}\n\n${retryInstruction} Do not use external sites, site indexes, listing indexes, shared style files, or reference pages as final verification for scoped UI edits. Start or repair the project's local dev/static server if needed, use the port the project actually declares, open the real localhost/127.0.0.1 URL for each edited target screen, inspect the changed screen, fix visible issues, and only then end with ✓ TASK_COMPLETE.`);
           } else if (hasIncompleteTurn) {
             // openclaw reported an incomplete turn (payloads=0) after the agent used a tool.
             // This is a tool timeout, not a narration. Reset nudgeCount and give a targeted retry hint.