@shepai/cli 1.50.0 → 1.51.0

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

@@ -1 +1 @@
-{"version":3,"file":"merge-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAqCxD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,CAyDR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,CAiER"}
+{"version":3,"file":"merge-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAqCxD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,CAyDR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,SAAS,UAAQ,GAChB,MAAM,CAkER"}

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

@@ -104,7 +104,7 @@ ${steps.join('\n')}
  * When no PR exists, performs a local merge in the ORIGINAL repo directory
  * (not the worktree, which IS the feature branch).
  */
-export function buildMergeSquashPrompt(state, branch, baseBranch) {
+export function buildMergeSquashPrompt(state, branch, baseBranch, hasRemote = false) {
     if (state.prUrl && state.prNumber) {
         // PR path: remote merge via GitHub CLI — no local merge needed
         return `You are merging a pull request via the GitHub CLI.
@@ -127,7 +127,6 @@ export function buildMergeSquashPrompt(state, branch, baseBranch) {
     }
     // Non-PR path: local merge in the ORIGINAL repo (not the worktree)
     const originalRepo = state.repositoryPath;
-    const hasRemote = state.push || state.openPr;
     const fetchSteps = hasRemote
         ? `2. Fetch latest: \`git fetch origin\`
 3. Checkout the base branch: \`git checkout ${baseBranch}\`
@@ -163,6 +162,8 @@ ${fetchSteps}
 
 - Use squash merge strategy to keep history clean
 - All commands MUST run in \`${originalRepo}\` (the original repo), NOT in the worktree
+- NEVER remove, modify, or prune git worktrees — they are managed by the system
+- Do NOT try to \`git checkout\` the feature branch — \`git merge --squash\` reads from it without checking it out
 - If conflicts arise during merge, attempt to resolve them intelligently
 - Do NOT modify any source code beyond what is needed for conflict resolution
 - Report the merge result clearly`;

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts

@@ -22,6 +22,7 @@ export declare class GitPrService implements IGitPrService {
     watchCi(cwd: string, branch: string, timeoutMs?: number): Promise<CiStatusResult>;
     deleteBranch(cwd: string, branch: string, deleteRemote?: boolean): Promise<void>;
     getPrDiffSummary(cwd: string, baseBranch: string): Promise<DiffSummary>;
+    verifyMerge(cwd: string, featureBranch: string, baseBranch: string): Promise<boolean>;
     private parseGitError;
     private parseGhError;
     private parsePrNumberFromUrl;

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAC5G,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACf,MAAM,wEAAwE,CAAC;AAOhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,YAAa,YAAW,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC9C,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuClE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,aAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBjE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuBjF,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhF,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAe7E,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,aAAa;CAiBtB"}
+{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAC5G,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACf,MAAM,wEAAwE,CAAC;AAOhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,YAAa,YAAW,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC9C,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuClE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,aAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBjE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuBjF,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhF,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAevE,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW3F,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,aAAa;CAiBtB"}

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.js

@@ -191,6 +191,17 @@ let GitPrService = class GitPrService {
         const { stdout: logOutput } = await this.execFile('git', ['log', '--oneline', `${baseBranch}...HEAD`], { cwd });
         return this.parseDiffStat(diffStat, logOutput);
     }
+    async verifyMerge(cwd, featureBranch, baseBranch) {
+        try {
+            await this.execFile('git', ['merge-base', '--is-ancestor', featureBranch, baseBranch], {
+                cwd,
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
     parseGitError(error) {
         const message = error instanceof Error ? error.message : String(error);
         const cause = error instanceof Error ? error : undefined;

package/dist/src/presentation/cli/commands/settings/agent.command.js

@@ -33,15 +33,15 @@ Examples:
             const isNonInteractive = options.agent !== undefined;
             let input;
             if (isNonInteractive) {
-                // Non-interactive: require --auth when --agent is provided
-                if (!options.auth) {
+                // Non-interactive: require --auth when --agent is provided (dev type defaults to session)
+                if (!options.auth && options.agent !== 'dev') {
                     messages.error('--auth is required when using --agent flag');
                     process.exitCode = 1;
                     return;
                 }
                 input = {
                     type: options.agent,
-                    authMethod: options.auth,
+                    authMethod: options.auth ?? 'session',
                     ...(options.token !== undefined && { token: options.token }),
                 };
             }

package/dist/src/presentation/tui/prompts/agent-select.prompt.d.ts

@@ -21,6 +21,14 @@ export declare function createAgentSelectConfig(): {
         readonly name: "Gemini CLI";
         readonly value: AgentType.GeminiCli;
         readonly description: "Google Gemini CLI";
+    }, {
+        readonly name: "Cursor";
+        readonly value: AgentType.Cursor;
+        readonly description: "Cursor AI coding agent";
+    }, {
+        readonly name: "Dev (Mock)";
+        readonly value: AgentType.Dev;
+        readonly description: "Local development mock — no agent binary required";
     }, {
         readonly name: "Aider";
         readonly value: AgentType.Aider;
@@ -29,10 +37,6 @@ export declare function createAgentSelectConfig(): {
         readonly name: "Continue";
         readonly value: AgentType.Continue;
         readonly disabled: "(Coming Soon)";
-    }, {
-        readonly name: "Cursor";
-        readonly value: AgentType.Cursor;
-        readonly description: "Cursor AI coding agent";
     }];
     readonly theme: {
         readonly prefix: {

package/dist/src/presentation/tui/prompts/agent-select.prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-select.prompt.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/tui/prompts/agent-select.prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAGzD;;;;;GAKG;AACH,wBAAgB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgCtC"}
+{"version":3,"file":"agent-select.prompt.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/tui/prompts/agent-select.prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAGzD;;;;;GAKG;AACH,wBAAgB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqCtC"}

package/dist/src/presentation/tui/prompts/agent-select.prompt.js

@@ -26,6 +26,16 @@ export function createAgentSelectConfig() {
                 value: AgentType.GeminiCli,
                 description: 'Google Gemini CLI',
             },
+            {
+                name: 'Cursor',
+                value: AgentType.Cursor,
+                description: 'Cursor AI coding agent',
+            },
+            {
+                name: 'Dev (Mock)',
+                value: AgentType.Dev,
+                description: 'Local development mock — no agent binary required',
+            },
             {
                 name: 'Aider',
                 value: AgentType.Aider,
@@ -36,11 +46,6 @@ export function createAgentSelectConfig() {
                 value: AgentType.Continue,
                 disabled: '(Coming Soon)',
             },
-            {
-                name: 'Cursor',
-                value: AgentType.Cursor,
-                description: 'Cursor AI coding agent',
-            },
         ],
         theme: shepTheme,
     };

package/dist/src/presentation/web/components/common/feature-node/agent-type-icons.d.ts

@@ -1,6 +1,6 @@
 import type { ComponentType, SVGProps } from 'react';
 /** Agent type values mirroring the TypeSpec AgentType enum. */
-export type AgentTypeValue = 'claude-code' | 'cursor' | 'gemini-cli' | 'aider' | 'continue';
+export type AgentTypeValue = 'claude-code' | 'cursor' | 'gemini-cli' | 'aider' | 'continue' | 'dev';
 type IconProps = SVGProps<SVGSVGElement> & {
     className?: string;
 };

package/dist/src/presentation/web/components/common/feature-node/agent-type-icons.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-type-icons.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/agent-type-icons.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAIrD,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG,QAAQ,GAAG,YAAY,GAAG,OAAO,GAAG,UAAU,CAAC;AAE5F,KAAK,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAmBlE,6DAA6D;AAC7D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,2CAOhD;AAUD,wEAAwE;AACxE,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,CAK7E"}
+{"version":3,"file":"agent-type-icons.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/agent-type-icons.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAKrD,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG,QAAQ,GAAG,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,KAAK,CAAC;AAEpG,KAAK,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAmBlE,6DAA6D;AAC7D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,2CAOhD;AAgBD,wEAAwE;AACxE,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,CAK7E"}

package/dist/src/presentation/web/components/common/feature-node/agent-type-icons.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import Image from 'next/image';
+import { Beaker } from 'lucide-react';
 import { cn } from '../../../lib/utils.js';
 /** Create a stable image-based icon component for a brand. */
 function createBrandIcon(src, alt) {
@@ -13,12 +14,17 @@ function createBrandIcon(src, alt) {
 export function DefaultAgentIcon(props) {
     return (_jsxs("svg", { viewBox: "0 0 24 24", fill: "none", xmlns: "http://www.w3.org/2000/svg", ...props, children: [_jsx("circle", { cx: "12", cy: "12", r: "9", stroke: "currentColor", strokeWidth: "2" }), _jsx("circle", { cx: "12", cy: "12", r: "3", fill: "currentColor" })] }));
 }
+function DevAgentIcon({ className, ...props }) {
+    return _jsx(Beaker, { className: cn('h-6 w-6', className), ...props });
+}
+DevAgentIcon.displayName = 'DevAgentIcon';
 const agentTypeIconMap = {
     'claude-code': createBrandIcon('/icons/agents/claude-ai-icon.svg', 'Claude Code'),
     cursor: createBrandIcon('/icons/agents/cursor.jpeg', 'Cursor'),
     'gemini-cli': createBrandIcon('/icons/agents/gemini-cli.jpeg', 'Gemini CLI'),
     aider: createBrandIcon('/icons/agents/aider.png', 'Aider'),
     continue: createBrandIcon('/icons/agents/continue.jpeg', 'Continue'),
+    dev: DevAgentIcon,
 };
 /** Resolve an agent type string to its corresponding icon component. */
 export function getAgentTypeIcon(agentType) {

package/dist/src/presentation/web/components/common/feature-node/agent-type-icons.stories.d.ts

@@ -5,4 +5,5 @@ type Story = StoryObj;
 export declare const AllIcons: Story;
 export declare const SmallIcons: Story;
 export declare const LargeIcons: Story;
+export declare const DevAgentIcon: Story;
 //# sourceMappingURL=agent-type-icons.stories.d.ts.map

package/dist/src/presentation/web/components/common/feature-node/agent-type-icons.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-type-icons.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/agent-type-icons.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAwCvD,QAAA,MAAM,IAAI,EAAE,IAIX,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC;AAEtB,eAAO,MAAM,QAAQ,EAAE,KAEtB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,KAExB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,KAExB,CAAC"}
+{"version":3,"file":"agent-type-icons.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-node/agent-type-icons.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAyCvD,QAAA,MAAM,IAAI,EAAE,IAIX,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC;AAEtB,eAAO,MAAM,QAAQ,EAAE,KAEtB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,KAExB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,KAExB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAa1B,CAAC"}

package/dist/src/presentation/web/components/common/feature-node/agent-type-icons.stories.js

@@ -6,6 +6,7 @@ const allAgentTypes = [
     { type: 'gemini-cli', label: 'Gemini CLI' },
     { type: 'aider', label: 'Aider' },
     { type: 'continue', label: 'Continue' },
+    { type: 'dev', label: 'Dev (Mock)' },
 ];
 function AgentIconGallery({ size }) {
     return (_jsxs("div", { className: "flex flex-wrap gap-6", children: [allAgentTypes.map(({ type, label }) => {
@@ -28,3 +29,9 @@ export const SmallIcons = {
 export const LargeIcons = {
     render: () => _jsx(AgentIconGallery, { size: 16 }),
 };
+export const DevAgentIcon = {
+    render: () => {
+        const Icon = getAgentTypeIcon('dev');
+        return (_jsxs("div", { className: "flex flex-col items-center gap-2", children: [_jsx("div", { className: "border-border bg-muted/30 rounded-md border p-3", children: _jsx(Icon, { style: { width: 40, height: 40 } }) }), _jsx("span", { className: "text-sm font-medium", children: "Dev (Mock)" }), _jsx("code", { className: "text-muted-foreground text-xs", children: "dev" })] }));
+    },
+};