@shepai/cli 1.122.2-pr367.fdba557 → 1.122.2-pr381.7d9e407

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

@@ -98,66 +98,94 @@ export function createMergeNode(deps) {
                 : undefined;
             // --- Agent Call 1: Commit + Push + PR (skip on approval resume) ---
             if (!isResumeAfterInterrupt) {
-                if (!remoteAvailable) {
-                    log.info('No git remote configured — skipping push and PR, will merge locally');
-                }
                 const effectiveState = remoteAvailable ? state : { ...state, push: false, openPr: false };
-                log.info('Agent call 1: commit + push + PR');
-                const commitPushPrPrompt = buildCommitPushPrPrompt(effectiveState, branch, baseBranch, repoUrl);
-                const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
-                    logger: log,
-                });
-                totalInputTokens += commitResult.usage?.inputTokens ?? 0;
-                totalOutputTokens += commitResult.usage?.outputTokens ?? 0;
-                totalCostUsd += commitResult.usage?.costUsd ?? 0;
-                totalNumTurns += commitResult.usage?.numTurns ?? 0;
-                totalDurationApiMs += commitResult.usage?.durationApiMs ?? 0;
-                commitHash = parseCommitHash(commitResult.result) ?? state.commitHash;
-                messages.push(`[merge] Agent completed commit/push/PR operations`);
-                if (effectiveState.openPr) {
-                    const prResult = parsePrUrl(commitResult.result);
-                    if (prResult) {
-                        prUrl = prResult.url;
-                        prNumber = prResult.number;
-                        // Cross-validate agent-parsed PR URL against authoritative source.
-                        // The agent may hallucinate the repo URL or PR number, so we look up
-                        // the real PR for this branch via the GitHub API.
-                        try {
-                            const prStatuses = await deps.gitPrService.listPrStatuses(cwd);
-                            const matchingPr = prStatuses.find((pr) => pr.headRefName === branch);
-                            if (matchingPr) {
-                                prUrl = matchingPr.url;
-                                prNumber = matchingPr.number;
-                            }
+                const needsAgentCall = effectiveState.push || effectiveState.openPr;
+                if (!needsAgentCall) {
+                    // Local-only: commit programmatically in worktree, no agent needed.
+                    // This avoids calling the agent executor just to run git commit,
+                    // which is slow/unreliable on some platforms (e.g. cursor on Windows hangs).
+                    log.info('Local-only mode — committing in worktree programmatically (no agent)');
+                    const worktreeCwd = state.worktreePath ?? cwd;
+                    try {
+                        const msg = `feat: ${branch}`;
+                        const hash = await deps.commitAll(worktreeCwd, msg);
+                        if (hash) {
+                            commitHash = hash;
+                            log.info(`Committed changes in worktree: ${commitHash}`);
+                            messages.push(`[merge] Programmatic commit: ${commitHash}`);
                         }
-                        catch {
-                            // gh CLI unavailable or API failure — fall back to agent-parsed URL
+                        else {
+                            log.info('No changes to commit in worktree');
+                            messages.push(`[merge] No changes to commit`);
                         }
-                        messages.push(`[merge] PR created: ${prUrl}`);
+                    }
+                    catch (commitErr) {
+                        const errMsg = commitErr instanceof Error ? commitErr.message : String(commitErr);
+                        log.info(`Programmatic commit failed: ${errMsg} — falling back to agent`);
+                        messages.push(`[merge] Programmatic commit failed, falling back to agent`);
+                        // Fall through — needsAgentCall stays false so agent won't run either.
+                        // The localMergeSquash will handle uncommitted changes via --squash.
                     }
                 }
-                // --- CI watch/fix loop (when push or openPr is enabled and CI watch is not disabled) ---
-                const ciWatchEnabled = getSettings().workflow?.ciWatchEnabled !== false;
-                if (ciWatchEnabled && (effectiveState.push || effectiveState.openPr)) {
-                    const ciResult = await runCiWatchFixLoop({
-                        executor,
-                        gitPrService: deps.gitPrService,
-                        featureRepository: deps.featureRepository,
-                    }, {
-                        cwd,
-                        branch,
-                        options,
-                        feature,
-                        prUrl,
-                        prNumber,
-                        existingAttempts: ciFixAttempts,
-                        messages,
-                        log,
+                if (needsAgentCall) {
+                    if (!remoteAvailable) {
+                        log.info('No git remote configured — skipping push and PR, will merge locally');
+                    }
+                    log.info('Agent call 1: commit + push + PR');
+                    const commitPushPrPrompt = buildCommitPushPrPrompt(effectiveState, branch, baseBranch, repoUrl);
+                    const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
+                        logger: log,
                     });
-                    ciStatus = ciResult.ciStatus;
-                    ciFixAttempts = ciResult.ciFixAttempts;
-                    ciFixHistory = ciResult.ciFixHistory;
-                    ciFixStatus = ciResult.ciFixStatus;
+                    totalInputTokens += commitResult.usage?.inputTokens ?? 0;
+                    totalOutputTokens += commitResult.usage?.outputTokens ?? 0;
+                    totalCostUsd += commitResult.usage?.costUsd ?? 0;
+                    totalNumTurns += commitResult.usage?.numTurns ?? 0;
+                    totalDurationApiMs += commitResult.usage?.durationApiMs ?? 0;
+                    commitHash = parseCommitHash(commitResult.result) ?? state.commitHash;
+                    messages.push(`[merge] Agent completed commit/push/PR operations`);
+                    if (effectiveState.openPr) {
+                        const prResult = parsePrUrl(commitResult.result);
+                        if (prResult) {
+                            prUrl = prResult.url;
+                            prNumber = prResult.number;
+                            // Cross-validate agent-parsed PR URL against authoritative source.
+                            try {
+                                const prStatuses = await deps.gitPrService.listPrStatuses(cwd);
+                                const matchingPr = prStatuses.find((pr) => pr.headRefName === branch);
+                                if (matchingPr) {
+                                    prUrl = matchingPr.url;
+                                    prNumber = matchingPr.number;
+                                }
+                            }
+                            catch {
+                                // gh CLI unavailable or API failure — fall back to agent-parsed URL
+                            }
+                            messages.push(`[merge] PR created: ${prUrl}`);
+                        }
+                    }
+                    // --- CI watch/fix loop (when push or openPr is enabled and CI watch is not disabled) ---
+                    const ciWatchEnabled = getSettings().workflow?.ciWatchEnabled !== false;
+                    if (ciWatchEnabled && (effectiveState.push || effectiveState.openPr)) {
+                        const ciResult = await runCiWatchFixLoop({
+                            executor,
+                            gitPrService: deps.gitPrService,
+                            featureRepository: deps.featureRepository,
+                        }, {
+                            cwd,
+                            branch,
+                            options,
+                            feature,
+                            prUrl,
+                            prNumber,
+                            existingAttempts: ciFixAttempts,
+                            messages,
+                            log,
+                        });
+                        ciStatus = ciResult.ciStatus;
+                        ciFixAttempts = ciResult.ciFixAttempts;
+                        ciFixHistory = ciResult.ciFixHistory;
+                        ciFixStatus = ciResult.ciFixStatus;
+                    }
                 }
                 // --- Persist lifecycle + PR data before approval gate ---
                 // Setting lifecycle to Review serves as the resume detection marker

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.d.ts

@@ -32,7 +32,7 @@ export declare function getStageTimeoutMs(nodeName: string): number;
 /**
  * Build executor options with cwd. Each node gets a clean agent context.
  * The timeout is resolved per-stage from settings (workflow.stageTimeouts)
- * with a fallback to DEFAULT_STAGE_TIMEOUT_MS (10 min).
+ * with a fallback to DEFAULT_STAGE_TIMEOUT_MS (10 min per call, 30 min max with retries).
  *
  * When no `nodeName` is provided, the current node from state is used.
  */

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

@@ -46,7 +46,7 @@ export function readSpecFile(specDir, filename) {
     }
 }
 /** Default timeout per agent call (30 minutes) — prevents infinite hangs. */
-const DEFAULT_STAGE_TIMEOUT_MS = 1_800_000;
+const DEFAULT_STAGE_TIMEOUT_MS = 600_000; // 10 minutes per agent call (retryExecute retries 3x, so 30min max per phase)
 /**
  * Map from node name to the corresponding StageTimeouts field.
  * `fast-implement` reuses the implement timeout; `evidence` also reuses implement.
@@ -80,7 +80,7 @@ export function getStageTimeoutMs(nodeName) {
 /**
  * Build executor options with cwd. Each node gets a clean agent context.
  * The timeout is resolved per-stage from settings (workflow.stageTimeouts)
- * with a fallback to DEFAULT_STAGE_TIMEOUT_MS (10 min).
+ * with a fallback to DEFAULT_STAGE_TIMEOUT_MS (10 min per call, 30 min max with retries).
  *
  * When no `nodeName` is provided, the current node from state is used.
  */

package/dist/src/presentation/cli/commands/ui.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.command.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/cli/commands/ui.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAuC1D;;GAEG;AACH,wBAAgB,eAAe,IAAI,OAAO,CAwGzC"}
+{"version":3,"file":"ui.command.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/cli/commands/ui.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAgC1D;;GAEG;AACH,wBAAgB,eAAe,IAAI,OAAO,CA0FzC"}

package/dist/src/presentation/cli/commands/ui.command.js

@@ -23,7 +23,6 @@ import { initializeNotificationWatcher, getNotificationWatcher, } from '../../..
 import { initializePrSyncWatcher, getPrSyncWatcher, } from '../../../../packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.js';
 import { getExistingConnection } from '../../../../packages/core/src/infrastructure/persistence/sqlite/connection.js';
 import { BrowserOpenerService } from '../../../../packages/core/src/infrastructure/services/browser-opener.service.js';
-import { initializeWebhookManager, getWebhookManager, hasWebhookManager, } from '../../../../packages/core/src/infrastructure/services/webhook/webhook-manager.service.js';
 import { colors, fmt, messages } from '../ui/index.js';
 function parsePort(value) {
     const port = parseInt(value, 10);
@@ -71,17 +70,6 @@ Examples:
             const db = getExistingConnection();
             initializePrSyncWatcher(featureRepo, runRepo, gitPrService, notificationService, undefined, db);
             getPrSyncWatcher().start();
-            // Start webhook system (optional — falls back to polling if cloudflared is not available)
-            try {
-                const tunnelService = container.resolve('ITunnelService');
-                const webhookService = container.resolve('IWebhookService');
-                initializeWebhookManager(tunnelService, webhookService);
-                // Start is async and non-blocking — failures are logged, not thrown
-                void getWebhookManager().start(port);
-            }
-            catch {
-                // Webhook system is optional; polling continues to work
-            }
             const url = `http://localhost:${port}`;
             messages.success(`Server ready at ${fmt.code(url)}`);
             messages.info('Press Ctrl+C to stop');
@@ -103,9 +91,6 @@ Examples:
                 // Force exit after 5s if graceful shutdown stalls
                 const forceExit = setTimeout(() => process.exit(0), 5000);
                 forceExit.unref();
-                if (hasWebhookManager()) {
-                    await getWebhookManager().stop();
-                }
                 getPrSyncWatcher().stop();
                 getNotificationWatcher().stop();
                 await service.stop();

package/dist/src/presentation/web/components/layouts/app-sidebar/app-sidebar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-sidebar.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/layouts/app-sidebar/app-sidebar.tsx"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAG/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,YAAY,EAAE,iBAAiB,CAAC;IAEhC,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C;AAED,wBAAgB,UAAU,CAAC,EACzB,QAAQ,EACR,YAAY,EAEZ,cAAc,GACf,EAAE,eAAe,2CAsHjB"}
+{"version":3,"file":"app-sidebar.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/layouts/app-sidebar/app-sidebar.tsx"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAG/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,YAAY,EAAE,iBAAiB,CAAC;IAEhC,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C;AAED,wBAAgB,UAAU,CAAC,EACzB,QAAQ,EACR,YAAY,EAEZ,cAAc,GACf,EAAE,eAAe,2CAgHjB"}

package/dist/src/presentation/web/components/layouts/app-sidebar/app-sidebar.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { usePathname } from 'next/navigation';
-import { Home, Wrench, Puzzle, Settings, Webhook } from 'lucide-react';
+import { Home, Wrench, Puzzle, Settings } from 'lucide-react';
 import { Sidebar, SidebarHeader, SidebarContent, SidebarMenu, SidebarMenuItem, SidebarRail, useSidebar, } from '../../ui/sidebar.js';
 import { ScrollArea } from '../../ui/scroll-area.js';
 import { SidebarNavItem } from '../../common/sidebar-nav-item/index.js';
@@ -29,7 +29,7 @@ export function AppSidebar({ features, featureFlags, onFeatureClick, }) {
                                             'flex min-w-0 flex-1 items-center gap-2 overflow-hidden px-2',
                                             'transition-opacity duration-200 ease-out',
                                             expandedVisible ? 'opacity-100' : 'opacity-0',
-                                        ].join(' '), "aria-hidden": !expandedVisible, children: [_jsx(ShepLogo, { className: "shrink-0", size: 20, variant: versionData.isDev ? 'dev' : 'default' }), _jsx("span", { className: "truncate text-sm font-semibold tracking-tight", children: "Shep" }), _jsx(VersionBadge, { version: versionData.version, branch: versionData.branch || undefined, commitHash: versionData.commitHash || undefined, isDev: versionData.isDev, packageName: versionData.packageName, description: versionData.description, instancePath: versionData.instancePath || undefined })] })) : null, _jsx(SidebarCollapseToggle, { className: "shrink-0 transition-all duration-200" })] }) }), _jsx(SidebarNavItem, { icon: Home, label: "Control Center", href: "/", active: pathname === '/' }), _jsx(SidebarNavItem, { icon: Wrench, label: "Tools", href: "/tools", active: pathname === '/tools' }), featureFlags.skills ? (_jsx(SidebarNavItem, { icon: Puzzle, label: "Skills", href: "/skills", active: pathname === '/skills' })) : null, _jsx(SidebarNavItem, { icon: Webhook, label: "Webhooks", href: "/webhooks", active: pathname === '/webhooks' }), _jsx(SidebarNavItem, { icon: Settings, label: "Settings", href: "/settings", active: pathname === '/settings' })] }) }), _jsx(SidebarContent, { children: showExpanded ? (_jsxs("div", { className: [
+                                        ].join(' '), "aria-hidden": !expandedVisible, children: [_jsx(ShepLogo, { className: "shrink-0", size: 20, variant: versionData.isDev ? 'dev' : 'default' }), _jsx("span", { className: "truncate text-sm font-semibold tracking-tight", children: "Shep" }), _jsx(VersionBadge, { version: versionData.version, branch: versionData.branch || undefined, commitHash: versionData.commitHash || undefined, isDev: versionData.isDev, packageName: versionData.packageName, description: versionData.description, instancePath: versionData.instancePath || undefined })] })) : null, _jsx(SidebarCollapseToggle, { className: "shrink-0 transition-all duration-200" })] }) }), _jsx(SidebarNavItem, { icon: Home, label: "Control Center", href: "/", active: pathname === '/' }), _jsx(SidebarNavItem, { icon: Wrench, label: "Tools", href: "/tools", active: pathname === '/tools' }), featureFlags.skills ? (_jsx(SidebarNavItem, { icon: Puzzle, label: "Skills", href: "/skills", active: pathname === '/skills' })) : null, _jsx(SidebarNavItem, { icon: Settings, label: "Settings", href: "/settings", active: pathname === '/settings' })] }) }), _jsx(SidebarContent, { children: showExpanded ? (_jsxs("div", { className: [
                         'min-w-0 overflow-hidden transition-opacity duration-200 ease-out',
                         '[&_[data-sidebar=group-label]]:!mt-0 [&_[data-sidebar=group-label]]:!opacity-100 [&_[data-sidebar=group-label]]:!transition-none',
                         expandedVisible ? 'opacity-100' : 'opacity-0',

package/dist/src/presentation/web/dev-server.js

@@ -20,7 +20,6 @@ import { initializeSettings } from '../../../packages/core/src/infrastructure/se
 import { initializeNotificationWatcher, getNotificationWatcher, } from '../../../packages/core/src/infrastructure/services/notifications/notification-watcher.service.js';
 import { initializePrSyncWatcher, getPrSyncWatcher, } from '../../../packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.js';
 import { getExistingConnection } from '../../../packages/core/src/infrastructure/persistence/sqlite/connection.js';
-import { initializeWebhookManager, getWebhookManager, hasWebhookManager, } from '../../../packages/core/src/infrastructure/services/webhook/webhook-manager.service.js';
 const DEFAULT_PORT = 3000;
 async function isPortAvailable(port) {
     return new Promise((resolve) => {
@@ -69,17 +68,6 @@ async function main() {
         const db = getExistingConnection();
         initializePrSyncWatcher(featureRepo, runRepo, gitPrService, notificationService, undefined, db);
         getPrSyncWatcher().start();
-        // Start webhook system (optional — falls back to polling if cloudflared is not installed)
-        try {
-            const tunnelService = container.resolve('ITunnelService');
-            const webhookService = container.resolve('IWebhookService');
-            initializeWebhookManager(tunnelService, webhookService);
-            // Start is async and non-blocking — failures are logged, not thrown
-            void getWebhookManager().start(port);
-        }
-        catch (error) {
-            console.warn('[dev-server] Webhook system init failed (using polling fallback):', error);
-        }
     }
     catch (error) {
         console.warn('[dev-server] DI initialization failed — features will be empty:', error);
@@ -119,14 +107,6 @@ async function main() {
         console.log('\n[dev-server] Shutting down...');
         const forceExit = setTimeout(() => process.exit(0), 2000);
         try {
-            try {
-                if (hasWebhookManager()) {
-                    await getWebhookManager().stop();
-                }
-            }
-            catch {
-                /* not initialized */
-            }
             try {
                 getNotificationWatcher().stop();
             }