@hamp10/agentforge 0.2.32 → 0.2.33

package/package.json

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

package/src/worker.js

@@ -854,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 || []);
@@ -890,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)' : ''}`,
@@ -1294,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 [];
@@ -3469,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.
@@ -3794,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}`;
@@ -4112,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.`);
@@ -4559,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);
@@ -4570,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.