@shepai/cli 1.131.1 → 1.132.0-pr427.eb60966

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/fast-implement.node.js

@@ -59,9 +59,9 @@ export function createFastImplementNode(executor) {
             const durationMs = Date.now() - startTime;
             const elapsed = (durationMs / 1000).toFixed(1);
             log.info(`Complete (${result.result.length} chars, ${elapsed}s)`);
-            // Validate that the executor actually produced file changes
+            // Validate that the executor actually produced changes (uncommitted or committed)
             const cwd = state.worktreePath || state.repositoryPath;
-            if (!hasWorktreeChanges(cwd)) {
+            if (!hasWorktreeChanges(cwd) && !hasNewCommits(cwd)) {
                 throw new Error('[fast-implement] Agent produced no file changes — it may have entered plan mode or asked questions instead of implementing. Retrying.');
             }
             // --- Evidence sub-agent: capture proof of completion (settings-gated) ---
@@ -156,6 +156,28 @@ function hasWorktreeChanges(cwd) {
         return false;
     }
 }
+/**
+ * Check whether the current branch has commits that are not on the merge base
+ * (i.e., the agent made new commits during implementation). Uses
+ * `git log --oneline HEAD ^HEAD~1` as a lightweight check — if the agent
+ * committed, HEAD will have moved from where it started.
+ *
+ * We compare against the branch tracking ref or check if HEAD moved at all
+ * by looking at recent commits (within the last minute).
+ */
+function hasNewCommits(cwd) {
+    try {
+        // Check if there are any commits in the last 2 minutes (generous window for agent execution)
+        const output = execSync('git log --oneline --since="2 minutes ago" HEAD', {
+            cwd,
+            encoding: 'utf-8',
+        });
+        return output.trim().length > 0;
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Save evidence manifest to the shep home evidence folder so the
  * merge review UI can read it without accessing graph state.

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/evidence-prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evidence-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/evidence-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,WAAW,qBAAqB;IACpC,kEAAkE;IAClE,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,iBAAiB,EACxB,OAAO,GAAE,qBAAiD,GACzD,MAAM,CA0MR;AAgCD;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,eAAe,EAAE,EACzB,OAAO,GAAE,qBAAiD,GACzD,MAAM,CAqBR"}
+{"version":3,"file":"evidence-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/evidence-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,WAAW,qBAAqB;IACpC,kEAAkE;IAClE,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,iBAAiB,EACxB,OAAO,GAAE,qBAAiD,GACzD,MAAM,CAoNR;AAgCD;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,eAAe,EAAE,EACzB,OAAO,GAAE,qBAAiD,GACzD,MAAM,CAsBR"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/evidence-prompts.js

@@ -75,7 +75,8 @@ Save all evidence files to the shep home folder:
         })}`
         : `\n## Git Operations
 
-Do NOT commit or push any files. Evidence is stored locally only.`;
+Do NOT commit or push any evidence files. Evidence is stored locally only.
+However, if you make code fixes during evidence collection, those fixes MUST be committed (see "Handling Code Fixes" above).`;
     return `You are a senior software engineer performing the EVIDENCE COLLECTION phase of feature development.
 
 Your goal is to capture visual and textual evidence proving that the implemented tasks work as expected.${options.commitEvidence ? ' This evidence will be embedded in the pull request body for reviewer verification.' : ' This evidence will be available for review locally.'}
@@ -200,10 +201,19 @@ If no evidence can be captured (e.g., no UI to screenshot, no tests to run), out
 []
 \`\`\`
 
+## Handling Code Fixes During Evidence Collection
+
+If you discover that tests fail, the build breaks, or something needs a fix while collecting evidence:
+1. **Fix the issue first** — make the necessary code changes
+2. **Commit the fix immediately** with a descriptive conventional commit message (e.g. \`fix(scope): resolve test failure discovered during evidence collection\`)${state.push ? `\n3. **Push the fix**: \`git push -u origin HEAD\`` : ''}
+3. **Then continue** capturing evidence — the evidence should reflect the working state after the fix
+
+This ensures implementation changes and evidence remain in separate commits with a clean history.
+
 ## Constraints
 
-- Capture evidence for completed tasks only — do NOT modify any implementation code
 - Capture evidence that proves the feature works — prioritize screenshots for UI changes, test output for logic changes
+- If you need to fix code to make evidence pass, commit the fix BEFORE capturing/committing evidence
 - If a screenshot capture fails, document the failure reason in the evidence description and try alternative approaches before giving up
 - Do NOT capture evidence for documentation-only changes or spec files
 ${commitSection}`;
@@ -253,6 +263,7 @@ ${formatValidationErrors(errors)}
 ### Instructions
 
 - Review the issues above and capture the missing evidence
+- If you need to fix code to resolve a gap (e.g., a failing test), commit the fix FIRST before recapturing evidence
 - Focus on the specific gaps listed — do not re-capture evidence that already exists
 - Ensure new evidence files are saved to the correct paths
 - Output ALL evidence records (both previously captured and newly captured) in the JSON output block`;

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/fast-implement.prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fast-implement.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/fast-implement.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAwIxD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAuEzE"}
+{"version":3,"file":"fast-implement.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/fast-implement.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAwIxD;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAwEzE"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/fast-implement.prompt.js

@@ -179,7 +179,9 @@ ${userQuery}
 3. Run the test suite and fix any failures
 4. Run the linter and fix any issues
 5. Ensure the project builds successfully
-6. Do NOT commit, push, or create a PR — just make the code changes
+6. Commit your work with descriptive conventional commit messages (e.g. \`feat(scope): description\`)
+   - Commit incrementally as you complete logical units of work — do NOT wait until the end
+   - Each commit should be a coherent, working unit${state.push ? `\n7. Push to remote after committing: \`git push -u origin HEAD\`\n   - Do NOT wait for or watch CI — just push and finish` : ''}
 
 ## Working Directory
 
@@ -209,7 +211,6 @@ ${dirListing}
 
 - Implement ONLY what the user requested — nothing more
 - Follow existing codebase conventions and patterns
-- Do NOT commit, push, or create pull requests
 - Do NOT modify any spec YAML files
 - Keep changes focused and minimal
 - Do NOT enter plan mode — implement directly without planning phases

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/implement.prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"implement.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/implement.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,GAAG,EAAE;QAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IACnE,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB;AAwBD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,iBAAiB,EACxB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAAE,EAClB,OAAO,EAAE;IAAE,WAAW,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACzE,MAAM,CAgER"}
+{"version":3,"file":"implement.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/implement.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,GAAG,EAAE;QAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IACnE,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB;AAwBD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,iBAAiB,EACxB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAAE,EAClB,OAAO,EAAE;IAAE,WAAW,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACzE,MAAM,CAmER"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/implement.prompt.js

@@ -79,7 +79,10 @@ ${taskSections}
 2. For tasks with TDD guidance: write tests alongside implementation following the hints provided — use them as guidance, not rigid steps
 3. Follow existing codebase conventions for file placement, naming patterns, and architecture layers
 ${verificationBlock}
-5. Commit your work with descriptive conventional commit messages (e.g. \`feat(scope): description\`)${state.push ? `\n6. Push to remote after committing: \`git push -u origin HEAD\`\n   - Do NOT wait for or watch CI — just push and finish` : ''}
+5. Commit your work with descriptive conventional commit messages (e.g. \`feat(scope): description\`)
+   - Commit incrementally as you complete logical units of work — do NOT wait until the end
+   - Each commit should be a coherent, working unit
+   - It is CRITICAL that all implementation code is committed before this phase ends — evidence collection runs next and needs a clean working tree${state.push ? `\n6. Push to remote after committing: \`git push -u origin HEAD\`\n   - Do NOT wait for or watch CI — just push and finish` : ''}
 
 ## Working Directory
 

package/dist/src/presentation/tui/wizards/onboarding/onboarding.wizard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onboarding.wizard.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/tui/wizards/onboarding/onboarding.wizard.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AASH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAYzD;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,GAAE,MAAM,OAAO,CAAC,iBAAiB,CAAgB,EAC1D,OAAO,GAAE,MAAM,OAAO,CAAC,MAAM,CAAc,EAC3C,YAAY,GAAE,MAAM,OAAO,CAAC,sBAAsB,CAA2B,GAC5E,OAAO,CAAC,IAAI,CAAC,CAoCf"}
+{"version":3,"file":"onboarding.wizard.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/tui/wizards/onboarding/onboarding.wizard.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AASH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAmBzD;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,GAAE,MAAM,OAAO,CAAC,iBAAiB,CAAgB,EAC1D,OAAO,GAAE,MAAM,OAAO,CAAC,MAAM,CAAc,EAC3C,YAAY,GAAE,MAAM,OAAO,CAAC,sBAAsB,CAA2B,GAC5E,OAAO,CAAC,IAAI,CAAC,CAoCf"}

package/dist/src/presentation/tui/wizards/onboarding/onboarding.wizard.js

@@ -21,6 +21,11 @@ function showWelcomeBanner() {
     console.log(pc.cyan(pc.bold('  Welcome to Shep AI CLI')));
     console.log(pc.dim("  Let's set up your environment in 3 quick steps."));
     console.log();
+    console.log(pc.yellow('  ⚠ Prerequisite: ') +
+        pc.bold('GitHub CLI (gh)') +
+        pc.dim(' is required for full CI/CD self-healing capabilities.'));
+    console.log(pc.dim('  Install it from: ') + pc.underline('https://cli.github.com/'));
+    console.log();
 }
 /**
  * Runs the first-run onboarding wizard.

package/dist/src/presentation/web/components/features/control-center/welcome-agent-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"welcome-agent-setup.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/welcome-agent-setup.tsx"],"names":[],"mappings":"AAWA,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAMD,wBAAgB,iBAAiB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,sBAAsB,2CA4NlF"}
+{"version":3,"file":"welcome-agent-setup.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/features/control-center/welcome-agent-setup.tsx"],"names":[],"mappings":"AAWA,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAMD,wBAAgB,iBAAiB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,sBAAsB,2CAkPlF"}

package/dist/src/presentation/web/components/features/control-center/welcome-agent-setup.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useEffect, useCallback, useRef } from 'react';
-import { ChevronLeft, Loader2 } from 'lucide-react';
+import { ChevronLeft, Loader2, AlertTriangle } from 'lucide-react';
 import { getAllAgentModels } from '../../../app/actions/get-all-agent-models.js';
 import { updateAgentAndModel } from '../../../app/actions/update-agent-and-model.js';
 import { getAgentTypeIcon } from '../../common/feature-node/agent-type-icons.js';
@@ -93,7 +93,7 @@ export function WelcomeAgentSetup({ onComplete, className }) {
         : activeGroup
             ? `Choose which ${activeGroup.label} model to run.`
             : '';
-    return (_jsxs("div", { "data-testid": "welcome-agent-setup", className: cn('flex w-full flex-col items-center', className), children: [_jsx("div", { className: "mb-8 flex w-full max-w-xs items-center gap-1.5", children: STEPS.map((s, i) => (_jsx("div", { className: cn('h-[3px] flex-1 rounded-full transition-colors duration-300', i <= stepIndex ? 'bg-foreground/60' : 'bg-muted') }, s))) }), _jsxs("div", { className: cn('flex w-full flex-col items-center transition-opacity duration-200', visible && !transitioning ? 'opacity-100' : 'opacity-0'), children: [_jsx("h1", { className: "text-foreground/90 text-center text-5xl font-extralight tracking-tight", children: heroTitle }), _jsx("p", { className: "text-muted-foreground mt-3 text-center text-lg leading-relaxed font-light", children: heroSubtitle }), _jsxs("div", { className: "mt-8 flex w-full flex-col items-center", children: [step === 'select-agent' && (_jsx("div", { "data-testid": "agent-list", className: "grid w-full max-w-lg gap-3", style: {
+    return (_jsxs("div", { "data-testid": "welcome-agent-setup", className: cn('flex w-full flex-col items-center', className), children: [_jsx("div", { className: "mb-8 flex w-full max-w-xs items-center gap-1.5", children: STEPS.map((s, i) => (_jsx("div", { className: cn('h-[3px] flex-1 rounded-full transition-colors duration-300', i <= stepIndex ? 'bg-foreground/60' : 'bg-muted') }, s))) }), _jsxs("div", { className: cn('flex w-full flex-col items-center transition-opacity duration-200', visible && !transitioning ? 'opacity-100' : 'opacity-0'), children: [_jsx("h1", { className: "text-foreground/90 text-center text-5xl font-extralight tracking-tight", children: heroTitle }), _jsx("p", { className: "text-muted-foreground mt-3 text-center text-lg leading-relaxed font-light", children: heroSubtitle }), step === 'select-agent' && (_jsxs("div", { "data-testid": "gh-cli-notice", className: "mt-5 flex items-start gap-2 rounded-lg border border-amber-200 bg-amber-50 px-4 py-3 dark:border-amber-900 dark:bg-amber-950/40", children: [_jsx(AlertTriangle, { className: "mt-0.5 h-4 w-4 shrink-0 text-amber-500" }), _jsxs("p", { className: "text-sm leading-relaxed text-amber-800 dark:text-amber-300", children: [_jsx("span", { className: "font-medium", children: "GitHub CLI (gh)" }), " is required for full CI/CD self-healing capabilities.", ' ', _jsx("a", { href: "https://cli.github.com/", target: "_blank", rel: "noopener noreferrer", className: "underline underline-offset-2 hover:text-amber-900 dark:hover:text-amber-200", children: "Install it here" }), "."] })] })), _jsxs("div", { className: "mt-8 flex w-full flex-col items-center", children: [step === 'select-agent' && (_jsx("div", { "data-testid": "agent-list", className: "grid w-full max-w-lg gap-3", style: {
                                     gridTemplateColumns: `repeat(${Math.min(groups.length, 4)}, minmax(0, 1fr))`,
                                 }, children: groups.map((group) => {
                                     const GroupIcon = getAgentTypeIcon(group.agentType);