@hamp10/agentforge 0.2.47 → 0.2.49

package/package.json

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

package/scripts/check-task-semantics.js

@@ -522,6 +522,71 @@ try {
     /Requested scoped UI targets: alpha, beta/i,
     'multi-target UI quality retries should preserve the full scoped target set'
   );
+  const originalFindIncompleteScopedUiTargets = worker._findIncompleteScopedUiTargets;
+  worker._findIncompleteScopedUiTargets = () => [{
+    repo: fixture.repo,
+    missingSlugs: ['beta-ai'],
+    touchedSlugs: ['alpha-ai'],
+    changedFiles: ['public_html/domains/alpha-ai.html'],
+  }];
+  const incompleteRepairLead = worker._formatIncompleteScopedUiRepairLead(
+    baseline,
+    'Work on the Example.com listing pages for Alpha.ai and Beta.ai. Delete and rebuild both listing pages from a clean start.'
+  );
+  worker._findIncompleteScopedUiTargets = originalFindIncompleteScopedUiTargets;
+  assert.match(
+    incompleteRepairLead,
+    /missing-target pass for target page\(s\) not yet changed in the current diff: beta-ai/i,
+    'missing-target retries should name only the targets not yet addressed'
+  );
+  assert.match(
+    incompleteRepairLead,
+    /Do not delete, rewrite, or restart target page\(s\) already changed[\s\S]*alpha-ai/i,
+    'missing-target retries should avoid replaying earlier work on targets already touched in the diff'
+  );
+  assert.doesNotMatch(
+    incompleteRepairLead,
+    /The task is:|Delete and rebuild both/i,
+    'missing-target retries should not put the original reset-heavy task text at the top of the retry prompt'
+  );
+  assert.throws(
+    () => cli._guardDirectFileWritePath(
+      path.join(fixture.repo, 'public_html', 'domains', 'alpha.html'),
+      fixture.repo,
+      { task: incompleteRepairLead }
+    ),
+    /focused retry pass/i,
+    'direct writes should block already-touched scoped pages during a missing-target retry pass'
+  );
+  assert.doesNotThrow(
+    () => cli._guardDirectFileWritePath(
+      path.join(fixture.repo, 'public_html', 'domains', 'beta.html'),
+      fixture.repo,
+      { task: incompleteRepairLead }
+    ),
+    'direct writes should allow the missing scoped page during a missing-target retry pass'
+  );
+  const visualRepairLead = worker._formatVisualRepairTaskLead(
+    'Work on the Example.com listing pages for Alpha.ai and Beta.ai. Make both visually polished.',
+    'beta-ai: Visual warning: heading is clipped.'
+  );
+  assert.throws(
+    () => cli._guardDirectFileWritePath(
+      path.join(fixture.repo, 'public_html', 'domains', 'alpha.html'),
+      fixture.repo,
+      { task: visualRepairLead }
+    ),
+    /focused retry pass/i,
+    'direct writes should block non-failing scoped pages during a focused visual repair pass'
+  );
+  assert.doesNotThrow(
+    () => cli._guardDirectFileWritePath(
+      path.join(fixture.repo, 'public_html', 'domains', 'beta.html'),
+      fixture.repo,
+      { task: visualRepairLead }
+    ),
+    'direct writes should allow the failing scoped page during a focused visual repair pass'
+  );
   assert.equal(
     worker._formatRepeatedVisualRepairNudge(2),
     '',

package/src/OpenClawCLI.js

@@ -914,6 +914,24 @@ export class OpenClawCLI extends EventEmitter {
     return err;
   }
 
+  _directFocusedRetryAllowedSlugs(task) {
+    const text = String(task || '');
+    const patterns = [
+      /missing-target pass for target page\(s\) not yet changed in the current diff:\s*([^\n.]+)/i,
+      /visual repair pass for currently failing target page\(s\):\s*([^\n.]+)/i,
+    ];
+    for (const pattern of patterns) {
+      const match = text.match(pattern);
+      if (!match) continue;
+      const slugs = String(match[1] || '')
+        .split(/[,;]/)
+        .map(item => scopeSlug(item.trim()))
+        .filter(Boolean);
+      if (slugs.length > 0) return new Set(slugs);
+    }
+    return null;
+  }
+
   _isNestedProjectCopyPath(filePath, workDir) {
     const relative = path.relative(workDir, filePath);
     if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) return false;
@@ -1048,6 +1066,20 @@ export class OpenClawCLI extends EventEmitter {
     if (!this._directTaskScopeAllowsPath(filePath, workDir, options.task)) {
       throw this._directScopeViolationError(this._formatDirectScopeError(filePath, workDir, options.task));
     }
+    const focusedRetrySlugs = this._directFocusedRetryAllowedSlugs(options.task);
+    if (focusedRetrySlugs && slugs.length > 0) {
+      const matchedScopedSlugs = this._directScopeSlugsMatchingText(lowerRelativePath, slugs);
+      const matchesFocusedSlug = matchedScopedSlugs.some(slug => focusedRetrySlugs.has(slug));
+      if (matchedScopedSlugs.length > 0 && !matchesFocusedSlug) {
+        throw this._directScopeViolationError([
+          'Refusing to rewrite an already-addressed scoped target during a focused retry pass.',
+          `Requested path: ${relativePath}`,
+          `Current retry target(s): ${[...focusedRetrySlugs].join(', ')}.`,
+          `Path appears to belong to: ${matchedScopedSlugs.join(', ')}.`,
+          'Continue from the current repo state and edit the focused target page(s) named by the retry instruction, then verify every requested target page locally.',
+        ].join(' '));
+      }
+    }
     const collectionViolation = this._directNewHtmlPageCollectionViolation(
       filePath,
       workDir,

package/src/worker.js

@@ -1732,6 +1732,23 @@ export class AgentForgeWorker extends EventEmitter {
     return warnings.length > 0 ? this._formatIncompleteScopedUiTargetsNudge(warnings) : '';
   }
 
+  _formatIncompleteScopedUiRepairLead(repoBaselines, userMessage) {
+    const warnings = this._findIncompleteScopedUiTargets(repoBaselines, userMessage);
+    if (warnings.length === 0) return `The task is: "${userMessage}"`;
+    const { slugs: allSlugs } = this._extractExplicitScope(userMessage);
+    const missingSlugs = [...new Set(warnings.flatMap(w => w.missingSlugs || []))];
+    if (allSlugs.length < 2 || missingSlugs.length === 0) return `The task is: "${userMessage}"`;
+    const alreadyTouchedSlugs = allSlugs.filter(slug => !missingSlugs.includes(slug));
+    return [
+      `Original scoped UI target set: ${allSlugs.join(', ')}.`,
+      `This retry is a missing-target pass for target page(s) not yet changed in the current diff: ${missingSlugs.join(', ')}.`,
+      alreadyTouchedSlugs.length > 0
+        ? `Do not delete, rewrite, or restart target page(s) already changed in this diff just to repeat earlier work: ${alreadyTouchedSlugs.join(', ')}.`
+        : '',
+      'Continue from the current repo state, edit the missing target page(s) directly, then verify every requested target page locally before completion or delivery.',
+    ].filter(Boolean).join('\n');
+  }
+
   _formatScopedUiTargetSetReminder(userMessage) {
     if (!this._isBroadUiQualityTask(userMessage)) return '';
     const { slugs: allowedSlugs, pageOnly } = this._extractExplicitScope(userMessage);
@@ -4321,7 +4338,8 @@ export class AgentForgeWorker extends EventEmitter {
             nudgeCount++;
             if (nudgeCount < MAX_NUDGES) {
               console.log(`[${taskId}] Iteration missed scoped UI target(s) — continuing (${nudgeCount}/${MAX_NUDGES}, total UI repairs ${uiRepairNudgeCount}/${UI_REPAIR_NUDGE_LIMIT})`);
-              iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\n${interimIncompleteScopedUiTargetsNudge}\n\nContinue from the current changed files. Do not restart from scratch; address the missing target page(s), then verify each edited target screen after the final edit.`);
+              const incompleteScopedRepairLead = this._formatIncompleteScopedUiRepairLead(repoBaselines, scopeAwareUserMessage);
+              iterationMessage = withTaskContext(`${incompleteScopedRepairLead}\n\n${interimIncompleteScopedUiTargetsNudge}\n\nContinue from the current changed files. Do not restart from scratch; address the missing target page(s), then verify each edited target screen after the final edit.`);
               continue;
             }
             throw new Error('Task missed scoped UI target pages after repeated retries');
@@ -4490,7 +4508,8 @@ export class AgentForgeWorker extends EventEmitter {
               nudgeCount++;
               if (nudgeCount < MAX_NUDGES) {
                 console.log(`[${taskId}] UI completion missed scoped target(s) — nudging (${nudgeCount}/${MAX_NUDGES}, total UI repairs ${uiRepairNudgeCount}/${UI_REPAIR_NUDGE_LIMIT})`);
-                iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\n${incompleteScopedUiTargetsNudge}\n\nDo not mark complete until every named target page has been addressed directly and visually verified.`);
+                const incompleteScopedRepairLead = this._formatIncompleteScopedUiRepairLead(repoBaselines, scopeAwareUserMessage);
+                iterationMessage = withTaskContext(`${incompleteScopedRepairLead}\n\n${incompleteScopedUiTargetsNudge}\n\nDo not mark complete until every named target page has been addressed directly and visually verified.`);
                 continue;
               }
               throw new Error('UI task claimed completion while missing scoped target pages after repeated retries');
@@ -4764,7 +4783,8 @@ export class AgentForgeWorker extends EventEmitter {
                 nudgeCount++;
                 if (nudgeCount < MAX_NUDGES) {
                   console.log(`[${taskId}] Publish evidence missed scoped target(s) — continuing (${nudgeCount}/${MAX_NUDGES}, total UI repairs ${uiRepairNudgeCount}/${UI_REPAIR_NUDGE_LIMIT})`);
-                  iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\n${incompleteScopedUiTargetsNudge}\n\nContinue from the current repo state, address the missing target page(s), verify all edited target screens, then commit/push any additional changes before reporting delivery complete.`);
+                  const incompleteScopedRepairLead = this._formatIncompleteScopedUiRepairLead(repoBaselines, scopeAwareUserMessage);
+                  iterationMessage = withTaskContext(`${incompleteScopedRepairLead}\n\n${incompleteScopedUiTargetsNudge}\n\nContinue from the current repo state, address the missing target page(s), verify all edited target screens, then commit/push any additional changes before reporting delivery complete.`);
                   continue;
                 }
                 throw new Error('Publish task missed scoped target pages after repeated retries');