@hamp10/agentforge 0.2.28 → 0.2.30

package/package.json

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

package/scripts/check-task-semantics.js

@@ -949,6 +949,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

@@ -625,6 +625,29 @@ export class OpenClawCLI extends EventEmitter {
     return true;
   }
 
+  _isDirectScopedReferenceSourcePath(filePath, workDir, relativePath, slugs, pageOnly, task) {
+    if (!pageOnly || !this._allowsDirectScopedPageSourcesToRemainDeleted(task)) return false;
+    if (!Array.isArray(slugs) || slugs.length === 0) return false;
+    if (!this._isDirectPageSourcePath(relativePath)) return false;
+
+    const relative = path.relative(workDir, filePath);
+    if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) return false;
+
+    const contents = [];
+    try {
+      if (existsSync(filePath)) contents.push(readFileSync(filePath, 'utf-8'));
+    } catch {}
+    try {
+      contents.push(String(execFileSync('git', ['-C', workDir, 'show', `HEAD:${relativePath}`], {
+          encoding: 'utf-8',
+          maxBuffer: 5 * 1024 * 1024,
+          stdio: ['ignore', 'pipe', 'ignore'],
+        }) || ''));
+    } catch {}
+
+    return contents.some(content => this._directScopeSlugsMatchingText(String(content || '').toLowerCase(), slugs).length > 0);
+  }
+
   _directTaskScopeAllowsPath(filePath, workDir, task) {
     const { slugs, pageOnly } = this._extractDirectExplicitScope(task);
     if (slugs.length === 0) return true;
@@ -635,6 +658,7 @@ export class OpenClawCLI extends EventEmitter {
     const lower = String(scopePath || '').toLowerCase();
     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 !pageOnly || this._isDirectPageSourcePath(scopePath);
@@ -875,9 +899,21 @@ export class OpenClawCLI extends EventEmitter {
   }
 
   _isDirectBroadUiQualityTask(task) {
+    if (this._allowsDirectScopedPageSourcesToRemainDeleted(task)) return false;
     return /\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(String(task || ''));
   }
 
+  _allowsDirectScopedPageSourcesToRemainDeleted(task) {
+    const text = String(task || '');
+    const asksForDeletion = /\b(delete|remove|drop|unpublish|decommission|take down|take offline)\b/i.test(text);
+    if (!asksForDeletion) return false;
+
+    const rebuildNearDeletion =
+      /\b(delete|remove|drop|unpublish|decommission|take down|take offline)\b[^.!?\n]{0,180}\b(rebuild|recreate|remake|rewrite|replace|restore|redesign|build|create|implement|start over|from scratch|clean start|fresh start|same urls?|same paths?|preserv(?:e|ing) the same urls?)\b/i.test(text) ||
+      /\b(rebuild|recreate|remake|rewrite|replace|restore|redesign|build|create|implement|start over|from scratch|clean start|fresh start|same urls?|same paths?|preserv(?:e|ing) the same urls?)\b[^.!?\n]{0,180}\b(delete|remove|drop|unpublish|decommission|take down|take offline)\b/i.test(text);
+    return !rebuildNearDeletion;
+  }
+
   _gitHeadContentForPath(filePath) {
     try {
       const rawTargetPath = String(filePath || '');
@@ -1346,6 +1382,137 @@ export class OpenClawCLI extends EventEmitter {
     return '';
   }
 
+  _directTaskForbidsGitDelivery(task) {
+    return /\b(do not|don't|dont|without|skip|avoid)\b[^.!?\n]{0,80}\b(commit|push|publish|deploy|release)\b/i.test(String(task || '')) ||
+      /\b(local only|leave uncommitted|do not ship|don't ship|dont ship)\b/i.test(String(task || ''));
+  }
+
+  _directGitHasRemote(workDir) {
+    try {
+      execFileSync('git', ['rev-parse', '--is-inside-work-tree'], {
+        cwd: workDir,
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+      });
+      const remote = String(execFileSync('git', ['remote'], {
+        cwd: workDir,
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+      }) || '').trim();
+      return remote.length > 0;
+    } catch {
+      return false;
+    }
+  }
+
+  _directGitPendingDeliveryMessage(workDir, task, { directMutationCount = 0, taskRequiresFileChange = false } = {}) {
+    if (this._directTaskForbidsGitDelivery(task)) return '';
+    if (!directMutationCount && !taskRequiresFileChange) return '';
+    if (!this._directGitHasRemote(workDir)) return '';
+
+    const status = this._directGitStatusPorcelain(workDir).trim();
+    if (!status) return '';
+
+    return [
+      'The repo still has uncommitted changes after the task work.',
+      'This is not complete delivery for a git-backed project with a remote.',
+      'Review git status, stage only the intended task changes, commit them with a clear message, push to the configured upstream, then verify the pushed/live state.',
+      `Current git status:\n${status}`,
+    ].join('\n');
+  }
+
+  _directGitStatusPaths(statusText) {
+    const paths = [];
+    for (const rawLine of String(statusText || '').split('\n')) {
+      if (!rawLine.trim()) continue;
+      let rawPath = rawLine.length > 3 ? rawLine.slice(3).trim() : '';
+      if (!rawPath) continue;
+      if (rawPath.includes(' -> ')) rawPath = rawPath.split(' -> ').pop().trim();
+      rawPath = rawPath.replace(/^"|"$/g, '');
+      if (rawPath && !paths.includes(rawPath)) paths.push(rawPath);
+    }
+    return paths;
+  }
+
+  _directGitAutoDeliveryEligible(workDir, task, statusText) {
+    const { slugs } = this._extractDirectExplicitScope(task);
+    if (slugs.length === 0) return { ok: false, reason: 'No explicit task scope was detected for automatic delivery.' };
+    const paths = this._directGitStatusPaths(statusText);
+    if (paths.length === 0) return { ok: false, reason: 'No git status paths to deliver.' };
+    const outOfScope = paths.filter(rel => !this._directTaskScopeAllowsPath(path.resolve(workDir, rel), workDir, task));
+    if (outOfScope.length > 0) {
+      return { ok: false, reason: `Pending git changes include paths outside the resolved task scope: ${outOfScope.join(', ')}` };
+    }
+    return { ok: true, paths };
+  }
+
+  _directCommitMessageForTask(task) {
+    const cleaned = String(task || '')
+      .replace(/\s+/g, ' ')
+      .replace(/[.?!]+$/g, '')
+      .trim();
+    if (!cleaned) return 'Update project files';
+    const message = cleaned.length > 86 ? cleaned.slice(0, 83).trimEnd() + '...' : cleaned;
+    return message.charAt(0).toUpperCase() + message.slice(1);
+  }
+
+  _directMaybeAutoDeliverGitChanges(workDir, task, { directMutationCount = 0, taskRequiresFileChange = false } = {}) {
+    const pending = this._directGitPendingDeliveryMessage(workDir, task, { directMutationCount, taskRequiresFileChange });
+    if (!pending) return { delivered: false, pending: '' };
+
+    const status = this._directGitStatusPorcelain(workDir);
+    if (!status.trim()) return { delivered: false, pending: '' };
+    const eligibility = this._directGitAutoDeliveryEligible(workDir, task, status);
+    if (!eligibility.ok) return { delivered: false, pending, reason: eligibility.reason };
+
+    const message = this._directCommitMessageForTask(task);
+    try {
+      execFileSync('git', ['add', '--', ...eligibility.paths], {
+        cwd: workDir,
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+      });
+      const stagedDiff = execFileSync('git', ['diff', '--cached', '--stat'], {
+        cwd: workDir,
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+      }).trim();
+      if (!stagedDiff) return { delivered: false, pending: 'No staged changes remained after staging intended task paths.' };
+
+      execFileSync('git', ['commit', '-m', message], {
+        cwd: workDir,
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+      });
+      execFileSync('git', ['push'], {
+        cwd: workDir,
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+      });
+
+      const head = String(execFileSync('git', ['rev-parse', '--short', 'HEAD'], {
+        cwd: workDir,
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+      }) || '').trim();
+      const remaining = this._directGitStatusPorcelain(workDir).trim();
+      return {
+        delivered: true,
+        message: [
+          `Committed and pushed intended task changes${head ? ` at ${head}` : ''}.`,
+          stagedDiff ? `Delivered diff:\n${stagedDiff}` : null,
+          remaining ? `Remaining git status:\n${remaining}` : 'Working tree is clean after push.',
+        ].filter(Boolean).join('\n'),
+      };
+    } catch (err) {
+      return {
+        delivered: false,
+        pending,
+        reason: `Automatic git delivery failed: ${err.stderr?.toString?.().trim() || err.message || err}`,
+      };
+    }
+  }
+
   /**
    * Resolve the actual JSONL file path for a task session.
    * The embedded runner uses embeddedSessionId = "task-{taskId}", so the file is
@@ -4183,9 +4350,12 @@ export class OpenClawCLI extends EventEmitter {
       'You are a helpful AI assistant running inside AgentForge. For implementation tasks, inspect the local project, make concrete file changes, test them, and then summarize. Use tools when the task requires executing commands, reading/writing files, or checking the browser. Do not stop with a plan when code changes are required.',
       'The AgentForge dashboard is the orchestration control surface. Do not inspect or use it as product context unless the user task is explicitly about AgentForge itself. For user-project work, inspect the target project files and the actual app/site URL or local preview page.',
       '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)\b/i.test(task);
-    const taskRequiresVisualVerification = /\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))
@@ -4201,7 +4371,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 &&
@@ -4646,7 +4816,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,
@@ -4687,7 +4857,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);
     };
@@ -4699,12 +4869,13 @@ export class OpenClawCLI extends EventEmitter {
       return warnings.join('\n').slice(0, 1200);
     };
     const directStopResponse = (reason, forceIncomplete = false) => {
-      const noDeliverable = taskRequiresFileChange && directMutationCount === 0;
+      const pendingGitDelivery = this._directGitPendingDeliveryMessage(workDir, semanticTask, { directMutationCount, taskRequiresFileChange });
+      const noDeliverable = taskRequiresFileChange && directMutationCount === 0 && !pendingGitDelivery;
       const missingScopedMutation = missingScopedMutationSlugs();
       const missingVisualVerification = taskRequiresVisualVerification && directMutationCount > 0 && !hasCleanLocalVerificationForLatestMutation();
       const visualQualityBlocked = taskRequiresVisualVerification && directMutationCount > 0 && !!lastDirectVisualWarning;
-      const stoppedBeforeSummary = forceIncomplete && !noDeliverable && missingScopedMutation.length === 0 && !missingVisualVerification && !visualQualityBlocked;
-      const incomplete = forceIncomplete || noDeliverable || missingScopedMutation.length > 0 || missingVisualVerification || visualQualityBlocked;
+      const stoppedBeforeSummary = forceIncomplete && !noDeliverable && missingScopedMutation.length === 0 && !missingVisualVerification && !visualQualityBlocked && !pendingGitDelivery;
+      const incomplete = forceIncomplete || noDeliverable || missingScopedMutation.length > 0 || missingVisualVerification || visualQualityBlocked || !!pendingGitDelivery;
       return {
         text: [
           noDeliverable
@@ -4715,6 +4886,8 @@ export class OpenClawCLI extends EventEmitter {
               ? `Native AgentForge tools changed files, but the latest visual verification still reported visible UI problems. ${lastDirectVisualWarning} ${reason} This is not complete for a UI task. Fix the visible issues, reload the changed screen, and verify again.`
             : missingVisualVerification
               ? `Native AgentForge tools changed files, but the changed UI was not successfully loaded and inspected after the edits. ${missingScopedVerificationText()} ${reason} This is not complete for a UI task. Start or repair the local app server, open the real app URL, inspect the changed screen, fix visible issues, then finish. After a clean visual pass, do not make another file edit before delivery; if you edit again, verify again.`
+            : pendingGitDelivery
+              ? `Native AgentForge tools changed files, but the repo has not been delivered yet. ${reason}\n${pendingGitDelivery}`
             : stoppedBeforeSummary
               ? `Native AgentForge tools completed ${directToolCount} action(s), but the model stopped before producing a final summary. ${reason} This is not complete. Continue from the current files and browser state, verify the result, and finish with a clear final summary.`
             : `Native AgentForge tools completed ${directToolCount} action(s), including any edits or browser checks listed below. ${reason}`,
@@ -4783,6 +4956,20 @@ export class OpenClawCLI extends EventEmitter {
           usedTools: directToolCount > 0,
         };
       }
+      const delivery = this._directMaybeAutoDeliverGitChanges(workDir, semanticTask, { directMutationCount, taskRequiresFileChange });
+      if (delivery.delivered) {
+        recordDirectToolSummary('git', delivery.message);
+      } else if (delivery.pending) {
+        return {
+          text: [
+            summary || fallbackSummary,
+            delivery.pending,
+            delivery.reason ? `Delivery blocker: ${delivery.reason}` : null,
+          ].filter(Boolean).join('\n'),
+          hasToolCalls: false,
+          usedTools: directToolCount > 0,
+        };
+      }
       return {
         text: [
           summary || fallbackSummary,
@@ -4804,7 +4991,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;
@@ -4887,7 +5074,8 @@ export class OpenClawCLI extends EventEmitter {
 	          const text = parts.filter(p => p.text).map(p => p.text).join('');
 	          if (!functionCalls.length) {
 	            if (step > 0) {
-	              if (taskRequiresFileChange && directMutationCount === 0 && directInternalNudgeCount < 2) {
+	              const pendingGitDelivery = this._directGitPendingDeliveryMessage(workDir, semanticTask, { directMutationCount, taskRequiresFileChange });
+	              if (taskRequiresFileChange && directMutationCount === 0 && !pendingGitDelivery && directInternalNudgeCount < 2) {
 	                directInternalNudgeCount += 1;
 	                contents.push(content);
 	                contents.push({
@@ -4902,7 +5090,7 @@ export class OpenClawCLI extends EventEmitter {
 	                });
 	                continue;
 	              }
-              if (taskRequiresFileChange && directMutationCount === 0) {
+              if (taskRequiresFileChange && directMutationCount === 0 && !pendingGitDelivery) {
                 const inspectedText = stripCompletionMarker(text);
                 return {
                   text: [
@@ -5028,7 +5216,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;
@@ -5083,7 +5271,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', {
@@ -5108,7 +5296,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,
@@ -5514,7 +5702,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.
@@ -5653,10 +5841,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) {
@@ -5671,6 +5859,7 @@ export class OpenClawCLI extends EventEmitter {
         fallbackVisionModels,
         taskId,
         iteration,
+        rawUserTask: rawUserTask || task,
       });
       if (fastResult !== null) {
         if (fastResult.hasToolCalls) {

package/src/default-task-guides.js

@@ -73,7 +73,8 @@ export const DEFAULT_TASK_GUIDES = Object.freeze({
 - Run the relevant checks or explain exactly why they could not run.
 - Do not create throwaway proof files such as verification notes, screenshots, or status artifacts inside the user's repo unless the user asked for them.
 - Do not create or switch git branches unless the user asked for a branch or pull request. If the user asks to commit and push, deliver on the current branch/upstream.
-- If the user asks to commit, push, publish, deploy, release, or update a live site, that delivery step is part of the task. Do not report completion until you have run the matching git/deploy/publish command, verified the target state, and reported exact evidence.
+- If you intentionally change files in a git repo that has a configured remote/upstream, delivery includes staging the final verified changes, committing them with a clear message, pushing them, and verifying the target state after the push. Do not report completion while intended changes are only local unless the user explicitly asked not to push, the repo has no remote/upstream, authentication blocks the push, or verification/checks failed. Report those as blockers with exact evidence.
+- If the user asks to commit, push, publish, deploy, release, or update a live site, that delivery step is explicitly part of the task. Do not report completion until you have run the matching git/deploy/publish command, verified the target state, and reported exact evidence.
 - Report changed files and remaining blockers only after implementation is complete.`,
   }),
 });

package/src/worker.js

@@ -506,8 +506,10 @@ export class AgentForgeWorker extends EventEmitter {
     const asksForDeletion = /\b(delete|remove|drop|unpublish|decommission|take down|take offline)\b/i.test(text);
     if (!asksForDeletion) return false;
 
-    const asksForRebuildOrRepair = /\b(rebuild|recreate|remake|rewrite|replace|restore|redesign|build|create|implement|fix|improve|polish|repair|start over|from scratch|clean start|fresh start|same urls?|same paths?|preserv(?:e|ing) the same urls?)\b/i.test(text);
-    return !asksForRebuildOrRepair;
+    const rebuildNearDeletion =
+      /\b(delete|remove|drop|unpublish|decommission|take down|take offline)\b[^.!?\n]{0,180}\b(rebuild|recreate|remake|rewrite|replace|restore|redesign|build|create|implement|start over|from scratch|clean start|fresh start|same urls?|same paths?|preserv(?:e|ing) the same urls?)\b/i.test(text) ||
+      /\b(rebuild|recreate|remake|rewrite|replace|restore|redesign|build|create|implement|start over|from scratch|clean start|fresh start|same urls?|same paths?|preserv(?:e|ing) the same urls?)\b[^.!?\n]{0,180}\b(delete|remove|drop|unpublish|decommission|take down|take offline)\b/i.test(text);
+    return !rebuildNearDeletion;
   }
 
   _parseNumstat(output, source) {
@@ -701,10 +703,28 @@ export class AgentForgeWorker extends EventEmitter {
     return scopedSources.length > 0 && outOfScopeMentions.length === 0;
   }
 
-  _scopeAllowsChangedPath(baseline, rel, allowedSlugs, pageOnly) {
+  _isScopedReferenceSourcePath(baseline, rel, allowedSlugs, pageOnly, userMessage) {
+    if (!baseline?.root || !pageOnly || !this._allowsScopedPageSourcesToRemainDeleted(userMessage)) return false;
+    if (!Array.isArray(allowedSlugs) || allowedSlugs.length === 0) return false;
+    if (!this._isPageSourcePath(rel)) return false;
+
+    let content = '';
+    try {
+      content = this._gitPathExistsAtRef(baseline.root, baseline.head || 'HEAD', rel)
+        ? this._gitOutput(baseline.root, ['show', `${baseline.head || 'HEAD'}:${rel}`], 1000000)
+        : readFileSync(path.join(baseline.root, rel), 'utf-8');
+    } catch {
+      return false;
+    }
+
+    return this._scopeSlugsMatchingText(String(content || '').toLowerCase(), allowedSlugs).length > 0;
+  }
+
+  _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 (this._isScopedReferenceSourcePath(baseline, rel, allowedSlugs, pageOnly, userMessage)) return true;
     return this._isNewScopedPageOwnedAsset(baseline, rel, allowedSlugs, pageOnly);
   }
 
@@ -734,7 +754,7 @@ export class AgentForgeWorker extends EventEmitter {
       const initialDirty = new Set(baseline.initialDirtyPaths || []);
       const outOfScope = [...names]
         .filter(rel => !initialDirty.has(rel))
-        .filter(rel => !this._scopeAllowsChangedPath(baseline, rel, allowedSlugs, pageOnly))
+        .filter(rel => !this._scopeAllowsChangedPath(baseline, rel, allowedSlugs, pageOnly, userMessage))
         .sort();
       if (outOfScope.length > 0) {
         warnings.push({ repo: baseline.root, head: baseline.head, allowedSlugs, pageOnly, files: outOfScope });
@@ -800,7 +820,7 @@ export class AgentForgeWorker extends EventEmitter {
       const initialDirty = new Set(baseline.initialDirtyPaths || []);
       const files = [...names]
         .filter(rel => resetPreexistingScopedTargets || !initialDirty.has(rel))
-        .filter(rel => this._scopeAllowsChangedPath(baseline, rel, allowedSlugs, pageOnly))
+        .filter(rel => this._scopeAllowsChangedPath(baseline, rel, allowedSlugs, pageOnly, userMessage))
         .sort();
       if (files.length === 0) continue;
 
@@ -966,6 +986,40 @@ export class AgentForgeWorker extends EventEmitter {
     return warnings.length > 0 ? this._formatDeliveryStateNudge(warnings) : '';
   }
 
+  _repoBaselinesHaveDeliveredScopedChanges(repoBaselines, userMessage) {
+    if (!Array.isArray(repoBaselines) || repoBaselines.length === 0) return false;
+    const { slugs: allowedSlugs, pageOnly } = this._extractExplicitScope(userMessage);
+
+    for (const baseline of repoBaselines) {
+      if (!baseline?.root || !baseline.head) continue;
+      if (this._gitStatusPorcelain(baseline.root, 10000).trim()) continue;
+
+      const head = this._gitOutput(baseline.root, ['rev-parse', 'HEAD']);
+      if (!head || head === baseline.head) continue;
+
+      const currentBranch = this._gitOutput(baseline.root, ['rev-parse', '--abbrev-ref', 'HEAD']);
+      if (baseline.branch && currentBranch && currentBranch !== baseline.branch && !this._allowsBranchDelivery(userMessage)) continue;
+
+      const upstream = this._gitOutput(baseline.root, ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}']);
+      if (!upstream) continue;
+      const unpushed = Number.parseInt(this._gitOutput(baseline.root, ['rev-list', '--count', `${upstream}..HEAD`]) || '0', 10);
+      if (!Number.isFinite(unpushed) || unpushed > 0) continue;
+
+      const changed = String(this._gitOutput(baseline.root, ['diff', '--name-only', `${baseline.head}..HEAD`], 10000) || '')
+        .split('\n')
+        .map(line => line.trim())
+        .filter(Boolean);
+      if (changed.length === 0) continue;
+      if (allowedSlugs.length > 0) {
+        const outOfScope = changed.filter(rel => !this._scopeAllowsChangedPath(baseline, rel, allowedSlugs, pageOnly, userMessage));
+        if (outOfScope.length > 0) continue;
+      }
+      return true;
+    }
+
+    return false;
+  }
+
   _isBroadUiQualityTask(userMessage) {
     const text = String(userMessage || '');
     return /\b(professional|polish(?:ed)?|premium|quality|vibecoded|vibe-coded|looks? (?:bad|rough|unfinished|basic)|redesign|improve(?:d)? (?:the )?(?:ui|ux|design|page|pages|site|app|interface)|make (?:it|this|the .{0,50}) (?:look|feel)|landing pages?|listing pages?)\b/i.test(text);
@@ -2722,6 +2776,10 @@ export class AgentForgeWorker extends EventEmitter {
     
     const initialIsVisualUiTask = this._isVisualUiTask(userMessage, platformGuides);
     const initialIsPublishTask = this._isPublishTask(userMessage);
+    const initialRequiresDeliverable =
+      initialIsVisualUiTask ||
+      initialIsPublishTask ||
+      /\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(String(userMessage || ''));
     const TASK_TIMEOUT_MS = this._taskTimeoutMs({
       message: userMessage,
       platformGuides,
@@ -3526,6 +3584,7 @@ export class AgentForgeWorker extends EventEmitter {
       let runtimeStallRetryCount = 0;
       let runtimeModelSwitchCount = 0;
       let uiVerificationRetryCount = 0;
+      let taskAcceptedComplete = false;
       const runtimeModelsTried = new Set();
       const consumeUiRepairNudge = (reason, detail = '') => {
         if (!isVisualUiTask) return '';
@@ -3709,7 +3768,8 @@ export class AgentForgeWorker extends EventEmitter {
             providerKeys || null, effectiveImageModel || null,
             taskId, iteration,
             effectiveFallbackVisionModels,
-            imageGenerationModel || null
+            imageGenerationModel || null,
+            scopeAwareUserMessage
           );
           runtimeStallRetryCount = 0;
         } catch (runError) {
@@ -4184,6 +4244,7 @@ export class AgentForgeWorker extends EventEmitter {
               iterations: iteration
             });
           }
+          taskAcceptedComplete = true;
           break;
         }
 
@@ -4265,10 +4326,12 @@ export class AgentForgeWorker extends EventEmitter {
             cleanForCheck.match(/\?[^?]*$/m);
           if (isShortCompleteReply && !isVisualUiTask) {
             console.log(`[${taskId}] Agent gave short complete reply (${cleanForCheck.length} chars) — accepting as done (no nudge)`);
+            taskAcceptedComplete = true;
             break;
           }
           if (isConversational && !isVisualUiTask) {
             console.log(`[${taskId}] Agent gave conversational reply — accepting as done (no nudge)`);
+            taskAcceptedComplete = true;
             break;
           }
           const hasPublishEvidence = isPublishTask && this._hasPublishEvidence(output);
@@ -4415,6 +4478,7 @@ export class AgentForgeWorker extends EventEmitter {
               continue;
             }
             console.log(`[${taskId}] Publish evidence detected without explicit completion signal — accepting as done`);
+            taskAcceptedComplete = true;
             break;
           }
           // After genuine tool activity, check if the final paragraph reads like a conclusion.
@@ -4437,11 +4501,13 @@ export class AgentForgeWorker extends EventEmitter {
                 console.log(`[${taskId}] UI conclusion detected without visual verification — continuing`);
               } else {
                 console.log(`[${taskId}] Conclusion detected after tool activity (${lastPara.length} chars) — accepting as done`);
+                taskAcceptedComplete = true;
                 break;
               }
             }
           }
           const madeRealProgress = hasSubstantiveProgress;
+          const hasExplicitIncompleteResult = /\bThis is not complete\b|\bnot complete delivery\b|\brepo still has uncommitted changes\b|\bhas not been delivered yet\b|\bDelivery blocker\b/i.test(output);
           if (visualVerificationFailureNudge) {
             uiVerificationRetryCount++;
             if (uiVerificationRetryCount >= UI_REPAIR_NUDGE_LIMIT) {
@@ -4469,6 +4535,22 @@ export class AgentForgeWorker extends EventEmitter {
             nudgeCount = 0;
             console.log(`[${taskId}] Incomplete turn after tool call on iteration ${iteration} — resetting nudge count and retrying`);
             iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\nYour last tool call hit a timeout and the response was cut short. Please retry the same tool call now. When finished, end your response with ✓ TASK_COMPLETE.`);
+          } else if (hasExplicitIncompleteResult) {
+            if (this._repoBaselinesHaveDeliveredScopedChanges(repoBaselines, scopeAwareUserMessage)) {
+              console.log(`[${taskId}] Incomplete runner text ignored because scoped repo changes are already clean and pushed`);
+              taskAcceptedComplete = true;
+              taskResult.result = {
+                ...(taskResult.result || {}),
+                output: `Verified scoped changes are committed, pushed, and clean.\n✓ TASK_COMPLETE`,
+              };
+              break;
+            }
+            nudgeCount++;
+            if (nudgeCount >= MAX_NUDGES) {
+              throw new Error(`Task remained incomplete after repeated retries: ${output.trim().slice(0, 600)}`);
+            }
+            console.log(`[${taskId}] Incomplete task result detected — continuing (${nudgeCount}/${MAX_NUDGES})`);
+            iterationMessage = withTaskContext(`The task is: "${userMessage}"\n\nAgentForge determined the task is not complete yet:\n\n${output.trim().slice(0, 1200)}\n\nContinue from the current state and finish the missing work or delivery. Only end with ✓ TASK_COMPLETE after the task is actually complete.`);
           } else if (madeRealProgress) {
             nudgeCount = 0;
             console.log(`[${taskId}] Agent made substantive progress on iteration ${iteration} — continuing without nudge`);
@@ -4478,7 +4560,11 @@ export class AgentForgeWorker extends EventEmitter {
           } else {
             nudgeCount++;
             if (nudgeCount >= MAX_NUDGES) {
+              if (initialRequiresDeliverable) {
+                throw new Error(`Agent did not produce a completion signal after ${nudgeCount} retries for a task that requires a deliverable.`);
+              }
               console.log(`[${taskId}] Agent gave ${nudgeCount} consecutive narration-only responses — stopping`);
+              taskAcceptedComplete = true;
               break;
             }
             // Agent only narrated without acting — nudge it to use tools.
@@ -4509,6 +4595,13 @@ export class AgentForgeWorker extends EventEmitter {
         }
       }
 
+      if (initialRequiresDeliverable && taskResult?.success !== false && !taskAcceptedComplete) {
+        const rawLoopOutput = taskResult?.result?.output || '';
+        if (!/✓\s*TASK_COMPLETE/i.test(rawLoopOutput) && !this._repoBaselinesHaveDeliveredScopedChanges(repoBaselines, scopeAwareUserMessage)) {
+          throw new Error(`Task ended without a verified completion signal for a deliverable task. Last output: ${String(rawLoopOutput).trim().slice(0, 600)}`);
+        }
+      }
+
       // Clean up listeners and timer
       if (_cleanup) { _cleanup(); _cleanup = null; }
 
@@ -5476,6 +5569,9 @@ end tell`.trim().replace(/\n/g, '\n');
 
 	  _isVisualUiTask(message, platformGuides = []) {
 	    const text = String(message || '').toLowerCase();
+	    if (this._allowsScopedPageSourcesToRemainDeleted(text)) {
+	      return false;
+	    }
 	    if (Array.isArray(platformGuides) && platformGuides.some(g => String(g?.taskType || g?.task_type || '').toLowerCase() === 'ui')) {
 	      return true;
 	    }