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

@hamp10/agentforge 0.2.29 → 0.2.31

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 +31 -0
package/src/OpenClawCLI.js +23 -18
package/src/worker.js +2 -1

package/package.json CHANGED Viewed

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

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

@@ -555,6 +555,22 @@ try {
     /existing scoped page target/i,
     'scoped page work should not create a new same-slug page when an existing scoped target page is present'
   );
+  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>');
+  assert.doesNotThrow(
+    () => cli._guardDirectFileWritePath(
+      path.join(fixture.repo, 'public_html', 'domains', 'gamma.html'),
+      fixture.repo,
+      { task: 'Can you make listing pages for Gamma?' }
+    ),
+    'nested duplicate project copies should not block recreating the canonical page path'
+  );
+  assert.equal(
+    cli._directScopeFileCandidates(fixture.repo, ['gamma']).some(candidate => candidate.startsWith(`${path.basename(fixture.repo)}/`)),
+    false,
+    'scope candidates should not steer agents toward nested project-copy paths when the canonical parent exists'
+  );
   const extractedOldCss = Array.from({ length: 28 }, (_, i) =>
     `.hero-polish-${i} { color: #${String(100000 + i).slice(0, 6)}; padding: ${i + 1}px; margin: ${i}px; box-shadow: 0 0 ${i + 2}px rgba(0,0,0,.1); }`
   ).join('\n');
@@ -949,6 +965,21 @@ assert.match(
   /taskId,\n\s*iteration,/i,
   'direct fast path should receive taskId so UI peer context is task-scoped'
 );
+assert.match(
+  openClawSource,
+  /const semanticTask = String\(directOptions\.rawUserTask \|\| task \|\| ''\);[\s\S]*_guardDirectFileWritePath\(fileWriteTarget, workDir, \{ task: semanticTask \}\)/i,
+  'direct scope guards should use the raw user task, not expanded retry/platform context'
+);
+assert.match(
+  openClawSource,
+  /rawUserTask: rawUserTask \|\| task/i,
+  'direct fast path should pass the raw task separately from the expanded runtime prompt'
+);
+assert.match(
+  workerSource,
+  /imageGenerationModel \|\| null,\n\s*scopeAwareUserMessage/i,
+  'worker should pass the resolved raw user scope into direct agent execution'
+);
 assert.match(
   openClawSource,
   /persistDirectUiContext\(\);/i,

package/src/OpenClawCLI.js CHANGED Viewed

@@ -694,7 +694,10 @@ export class OpenClawCLI extends EventEmitter {
 	    walk(workDir, 0);
 	    const resultSet = new Set(results);
 	    return results.filter(rel => {
-	      const canonical = this._nestedProjectDuplicateCanonicalPath(path.resolve(workDir, rel), workDir);
+        const absolute = path.resolve(workDir, rel);
+        const nestedCanonical = this._nestedProjectCopyCanonicalPath(absolute, workDir);
+        if (nestedCanonical && existsSync(path.dirname(nestedCanonical))) return false;
+	      const canonical = this._nestedProjectDuplicateCanonicalPath(absolute, workDir);
 	      if (!canonical) return true;
 	      const canonicalRel = path.relative(workDir, canonical) || canonical;
 	      return !resultSet.has(canonicalRel);
@@ -4352,9 +4355,10 @@ export class OpenClawCLI extends EventEmitter {
       'For local browser verification, use the URL or port proven by project code, server output, or an already successful browser result. Do not try arbitrary localhost ports such as 3000 or 5000 just because they are common defaults.',
       'For git-backed projects with a remote, do not finish with intended changes only on disk. Stage the final intended changes, commit them, push to the configured upstream, and verify the resulting state unless the user explicitly asked not to. Do not create confirmation/status files just to prove the task is done.',
     ].join('\n');
-    const taskRequiresFileChange = /\b(make|create|build|add|implement|update|edit|change|fix|improve|redesign|refactor|write|generate|scaffold|wire|ship|work on|delete|remove|drop|unpublish|decommission|take down|take offline)\b/i.test(task);
-    const taskAllowsDeletedScopedPages = this._allowsDirectScopedPageSourcesToRemainDeleted(task);
-    const taskRequiresVisualVerification = !taskAllowsDeletedScopedPages && /\b(ui|ux|visual|design|frontend|css|html|pages?|dashboard|website|web app|app screen|layout|component|responsive|professional|polish(?:ed)?|vibecoded|vibe-coded|interface|screen|arena|competitive|competition|scoreboard|ranking|visual hierarchy|user experience|design system|readability|readable|legibility|contrast|accessibility)\b/i.test(task);
+    const semanticTask = String(directOptions.rawUserTask || task || '');
+    const taskRequiresFileChange = /\b(make|create|build|add|implement|update|edit|change|fix|improve|redesign|refactor|write|generate|scaffold|wire|ship|work on|delete|remove|drop|unpublish|decommission|take down|take offline)\b/i.test(semanticTask);
+    const taskAllowsDeletedScopedPages = this._allowsDirectScopedPageSourcesToRemainDeleted(semanticTask);
+    const taskRequiresVisualVerification = !taskAllowsDeletedScopedPages && /\b(ui|ux|visual|design|frontend|css|html|pages?|dashboard|website|web app|app screen|layout|component|responsive|professional|polish(?:ed)?|vibecoded|vibe-coded|interface|screen|arena|competitive|competition|scoreboard|ranking|visual hierarchy|user experience|design system|readability|readable|legibility|contrast|accessibility)\b/i.test(semanticTask);
     const directRequestTimeoutMs = Math.max(
       30_000,
       Number(process.env.AGENTFORGE_DIRECT_LLM_REQUEST_TIMEOUT_MS || (taskRequiresVisualVerification ? 120_000 : 90_000))
@@ -4370,7 +4374,7 @@ export class OpenClawCLI extends EventEmitter {
     let directMutationCount = 0;
     let lastCleanLocalVerificationMutationCount = 0;
     let lastDirectVisualWarning = '';
-    const explicitScopeForTask = this._extractDirectExplicitScope(task);
+    const explicitScopeForTask = this._extractDirectExplicitScope(semanticTask);
     const explicitScopeSlugsForTask = explicitScopeForTask.slugs || [];
     const taskRequiresComparableUiContext =
       taskRequiresVisualVerification &&
@@ -4815,7 +4819,7 @@ export class OpenClawCLI extends EventEmitter {
         });
         const result = await this._runDirectTool(agentId, 'browser', { action: 'open', url }, workDir, {
           signal: directAbortController.signal,
-          task,
+          task: semanticTask,
           imageModel: directOptions.imageModel,
           agentModel: directOptions.agentModel || model,
           fallbackVisionModels: directOptions.fallbackVisionModels,
@@ -4856,7 +4860,7 @@ export class OpenClawCLI extends EventEmitter {
       const match = text.match(/^URL:\s*(.+)$/mi);
       const urlText = match?.[1]?.trim() || '';
       if (!urlText) return false;
-      const { slugs } = this._extractDirectExplicitScope(task);
+      const { slugs } = this._extractDirectExplicitScope(semanticTask);
       if (slugs.length > 0 && scopeSlugsMatchingText(urlText, slugs).length === 0) return false;
       return /^(?:https?:\/\/(?:localhost|127\.0\.0\.1|0\.0\.0\.0|\[::1\])(?::\d+)?(?:\/|$)|file:)/i.test(urlText);
     };
@@ -4868,7 +4872,7 @@ export class OpenClawCLI extends EventEmitter {
       return warnings.join('\n').slice(0, 1200);
     };
     const directStopResponse = (reason, forceIncomplete = false) => {
-      const pendingGitDelivery = this._directGitPendingDeliveryMessage(workDir, task, { directMutationCount, taskRequiresFileChange });
+      const pendingGitDelivery = this._directGitPendingDeliveryMessage(workDir, semanticTask, { directMutationCount, taskRequiresFileChange });
       const noDeliverable = taskRequiresFileChange && directMutationCount === 0 && !pendingGitDelivery;
       const missingScopedMutation = missingScopedMutationSlugs();
       const missingVisualVerification = taskRequiresVisualVerification && directMutationCount > 0 && !hasCleanLocalVerificationForLatestMutation();
@@ -4955,7 +4959,7 @@ export class OpenClawCLI extends EventEmitter {
           usedTools: directToolCount > 0,
         };
       }
-      const delivery = this._directMaybeAutoDeliverGitChanges(workDir, task, { directMutationCount, taskRequiresFileChange });
+      const delivery = this._directMaybeAutoDeliverGitChanges(workDir, semanticTask, { directMutationCount, taskRequiresFileChange });
       if (delivery.delivered) {
         recordDirectToolSummary('git', delivery.message);
       } else if (delivery.pending) {
@@ -4990,7 +4994,7 @@ export class OpenClawCLI extends EventEmitter {
         return `I am checking the live browser${url} to judge the actual product surface before deciding the next change.`;
       }
       if (name === 'read_file' || name === 'read') {
-        const scope = extractExplicitScope(task);
+        const scope = extractExplicitScope(semanticTask);
         const targetText = String(targetPath || base || '').toLowerCase();
         const looksLikePageSource = /\.(html?|css|s[ac]ss|jsx?|tsx?|vue|svelte|astro|mdx?)$/i.test(targetText);
         const isNamedTarget = scope.slugs.length > 0 && scopeSlugsMatchingText(targetText, scope.slugs).length > 0;
@@ -5073,7 +5077,7 @@ export class OpenClawCLI extends EventEmitter {
 	          const text = parts.filter(p => p.text).map(p => p.text).join('');
 	          if (!functionCalls.length) {
 	            if (step > 0) {
-	              const pendingGitDelivery = this._directGitPendingDeliveryMessage(workDir, task, { directMutationCount, taskRequiresFileChange });
+	              const pendingGitDelivery = this._directGitPendingDeliveryMessage(workDir, semanticTask, { directMutationCount, taskRequiresFileChange });
 	              if (taskRequiresFileChange && directMutationCount === 0 && !pendingGitDelivery && directInternalNudgeCount < 2) {
 	                directInternalNudgeCount += 1;
 	                contents.push(content);
@@ -5215,7 +5219,7 @@ export class OpenClawCLI extends EventEmitter {
             const fileWriteTarget = directFileWriteTargetPath(name, args);
             if (fileWriteTarget) {
               try {
-                this._guardDirectFileWritePath(fileWriteTarget, workDir, { task });
+                this._guardDirectFileWritePath(fileWriteTarget, workDir, { task: semanticTask });
               } catch (err) {
                 if (err.code === 'AGENTFORGE_SCOPE_VIOLATION') {
                   directScopeViolationCount += 1;
@@ -5270,7 +5274,7 @@ export class OpenClawCLI extends EventEmitter {
                 responses.push({ functionResponse: { name, response: { error: message } } });
                 continue;
               }
-              const dirtyDeliveryMessage = this._directGitDirtyDeliveryMessage(workDir, task, command);
+              const dirtyDeliveryMessage = this._directGitDirtyDeliveryMessage(workDir, semanticTask, command);
               if (/\bgit\b[\s\S]*\b(?:commit|push)\b/i.test(command) && dirtyDeliveryMessage) {
                 emitDirectThought('AgentForge blocked commit/push because the staged delivery does not match the final working tree.');
                 this.emit('tool_activity', {
@@ -5295,7 +5299,7 @@ export class OpenClawCLI extends EventEmitter {
             try {
               const result = await this._runDirectTool(agentId, name, args, workDir, {
                 signal: directAbortController.signal,
-                task,
+                task: semanticTask,
                 imageModel: directOptions.imageModel,
                 agentModel: directOptions.agentModel || model,
                 fallbackVisionModels: directOptions.fallbackVisionModels,
@@ -5701,7 +5705,7 @@ export class OpenClawCLI extends EventEmitter {
    * Run an agent task
    * Images are saved to workspace and referenced in message for vision model analysis
    */
-  async runAgentTask(agentId, task, workDir, sessionId = null, image = null, browserProfile = null, imageWorkDir = null, agentModel = null, customSystemPrompt = null, conversationHistory = null, allImages = null, providerKeys = null, imageModel = null, taskId = null, iteration = 1, fallbackVisionModels = null, imageGenerationModel = null) {
+  async runAgentTask(agentId, task, workDir, sessionId = null, image = null, browserProfile = null, imageWorkDir = null, agentModel = null, customSystemPrompt = null, conversationHistory = null, allImages = null, providerKeys = null, imageModel = null, taskId = null, iteration = 1, fallbackVisionModels = null, imageGenerationModel = null, rawUserTask = null) {
     // Gateway auth comes from per-agent auth-profiles.json, not subprocess env.
     // Seed real Anthropic API keys up front so anthropic/* models do not fall back
     // to Claude account/OAuth tokens and fail with claude.ai "extra usage" limits.
@@ -5840,10 +5844,10 @@ export class OpenClawCLI extends EventEmitter {
     // OpenClaw subprocess after a model compatibility fallback.
     // If LLM answers with plain text → done in ~1-3s.
     // If LLM returns tool calls → fall through to gateway/subprocess as usual.
-    const directTaskText = String(taskForRuntime || '');
-    const directTaskRequiresFileChange = /\b(make|create|build|add|implement|update|edit|change|fix|improve|redesign|refactor|write|generate|scaffold|wire|ship|work on)\b/i.test(directTaskText);
+    const directSemanticTaskText = String(rawUserTask || task || taskForRuntime || '');
+    const directTaskRequiresFileChange = /\b(make|create|build|add|implement|update|edit|change|fix|improve|redesign|refactor|write|generate|scaffold|wire|ship|work on)\b/i.test(directSemanticTaskText);
     const directTaskRequiresVisualImplementation = directTaskRequiresFileChange &&
-      /\b(ui|ux|visual|design|frontend|css|html|pages?|dashboard|website|web app|app screen|layout|component|responsive|professional|polish(?:ed)?|vibecoded|vibe-coded|interface|screen|visual hierarchy|user experience|design system)\b/i.test(directTaskText);
+      /\b(ui|ux|visual|design|frontend|css|html|pages?|dashboard|website|web app|app screen|layout|component|responsive|professional|polish(?:ed)?|vibecoded|vibe-coded|interface|screen|visual hierarchy|user experience|design system)\b/i.test(directSemanticTaskText);
     const forceSubprocessForVisual = /^(1|true|yes)$/i.test(process.env.AGENTFORGE_FORCE_OPENCLAW_VISUAL || '');
     const skipDirectFastPath = directTaskRequiresVisualImplementation && forceSubprocessForVisual;
     if (skipDirectFastPath && agentModel) {
@@ -5858,6 +5862,7 @@ export class OpenClawCLI extends EventEmitter {
         fallbackVisionModels,
         taskId,
         iteration,
+        rawUserTask: rawUserTask || task,
       });
       if (fastResult !== null) {
         if (fastResult.hasToolCalls) {

package/src/worker.js CHANGED Viewed

@@ -3768,7 +3768,8 @@ export class AgentForgeWorker extends EventEmitter {
             providerKeys || null, effectiveImageModel || null,
             taskId, iteration,
             effectiveFallbackVisionModels,
-            imageGenerationModel || null
+            imageGenerationModel || null,
+            scopeAwareUserMessage
           );
           runtimeStallRetryCount = 0;
         } catch (runError) {