@vibecodetown/mcp-server 1.3.1 → 1.5.0

package/build/mcp/tools/vibe_pm/index.js

@@ -1,753 +1,466 @@
 // MVP Core - vibe_pm tools index
 // MVP 7개 도구만 포함
-import { McpError } from '@modelcontextprotocol/sdk/types.js';
 import { briefingInputSchema, briefingOutputSchema, getDecisionInputSchema, getDecisionOutputSchema, submitDecisionInputSchema, submitDecisionOutputSchema, createWorkOrderInputSchema, createWorkOrderOutputSchema, inspectCodeInputSchema, inspectCodeOutputSchema, statusInputSchema, statusOutputSchema, } from './types.js';
 import { briefing } from './briefing.js';
 import { getDecision } from './get_decision.js';
 import { submitDecision } from './submit_decision.js';
 import { createWorkOrder } from './create_work_order.js';
 import { doctor, DoctorInputSchema } from './doctor.js';
-import { IngressInputSchema, getIngressState, checkIngressArtifacts } from './ingress.js';
+import { IngressInputSchema } from './ingress.js';
 import { IngressOutputSchema } from '../../generated/ingress_output.js';
 import { MemoryStatusInputSchema } from '../../generated/memory_status_input.js';
-import { MemoryStatusOutputSchema, } from '../../generated/memory_status_output.js';
+import { MemoryStatusOutputSchema } from '../../generated/memory_status_output.js';
 import { MemorySyncInputSchema } from '../../generated/memory_sync_input.js';
-import { MemorySyncOutputSchema, } from '../../generated/memory_sync_output.js';
+import { MemorySyncOutputSchema } from '../../generated/memory_sync_output.js';
 import { MemoryRetrieveInputSchema } from '../../generated/memory_retrieve_input.js';
-import { MemoryRetrieveOutputSchema, } from '../../generated/memory_retrieve_output.js';
-import { SoftObserver, getObserver, startObserverIfEnabled, stopObserver, getObserverStatus as getObserverStatusFn, runDeltaScan, quickDirtyCheck, } from './observer.js';
-import { ToolErrorOutputSchema } from '../../generated/tool_error_output.js';
-import { checkToolAllowed } from './flow_policy.js';
-import { readRunState, resolveRunId } from './context.js';
-import { syncMcpToolResult, generateWorkspaceId, isDbSyncEnabled } from '../../../db_sync/index.js';
+import { MemoryRetrieveOutputSchema } from '../../generated/memory_retrieve_output.js';
 import { isRewindDirective } from './phase.js';
 import { statusWithRalph, inspectCodeWithRalph, ingressWithRalph } from './ralph-loop-tools.js';
 import { memoryStatus } from './memory_status.js';
 import { memorySync } from './memory_sync.js';
 import { memoryRetrieve } from './memory_retrieve.js';
 import { memory, MemoryInputSchema } from './memory.js';
-import { getFeatureFlags, isIngressRequired, isObserverEnabled, getObserverMode, isWatcherEnabled, getFeatureFlagsStatus, } from './feature-flags.js';
 import { ensureDocsStructure } from './docs_structure.js';
 import { initDocs, InitDocsInputSchema, } from './init_docs.js';
 import { setup, SetupInputSchema } from './setup.js';
 import { UIManifestInputSchema, UIResourceInputSchema, loadUIManifest, loadResource, } from './ui/index.js';
 import { scaffold, ScaffoldInputSchema, } from './scaffold.js';
+import { agent as agentTool, AgentInputSchema } from './agent.js';
+import { workspaceRecipe, WorkspaceRecipeInputSchema, } from './workspace_recipe.js';
+import { decisionHistory, DecisionHistoryInputSchema, } from './decision-history.js';
+import { scout } from './scout.js';
+import { ScoutInputSchema } from '../../generated/scout_input.js';
+import { ScoutOutputSchema } from '../../generated/scout_output.js';
 // Worker MCP tools (Phase 13)
 import { submitTask, submitTaskInputSchema, } from './submit_task.js';
 import { workerStatus, workerStatusInputSchema, } from './worker_status.js';
 import { getResult, getResultInputSchema, } from './get_result.js';
 import { dashboard, dashboardInputSchema, } from './dashboard.js';
+import { blockSearch, blockSearchInputSchema, } from './block_search.js';
+import { blockEvents, blockEventsInputSchema, } from './block_events.js';
+import { blockSnapshot, blockSnapshotInputSchema, } from './block_snapshot.js';
+import { skills, skillsInputSchema } from './skills_tool.js';
+import { suggestRoots, suggestRootsInputSchema } from './suggest_roots.js';
+import { checkResources, checkResourcesInputSchema } from './check_resources.js';
+import { checkDormant, checkDormantInputSchema } from './check_dormant.js';
+import { repairPlan, repairPlanInputSchema } from './repair_plan.js';
+import { finalizeWork, finalizeWorkInputSchema } from './finalize_work.js';
+import { undoLastTask, undoLastTaskInputSchema } from './undo_last_task.js';
+import { branchPivot, branchPivotInputSchema } from './branch_pivot.js';
+// Extracted modules
+import { createToolHandler, setKernelDepsForTools, resolveRunDir, toolResult, toStructuredContent, formatStatusSummary, readNestedString, getProjectOrRunId, fsmTransition, } from './tool_handler_factory.js';
 // ============================================================
-// Helper Functions
-// ============================================================
-function toolResult(toolName, data) {
-    return {
-        content: [{ type: 'text', text: JSON.stringify(data, null, 2) }],
-        structuredContent: data,
-    };
-}
-function formatStatusSummary(status) {
-    const parts = [
-        `상태: ${status.current_state.phase}`,
-        `다음: ${status.next_action.label}`,
-    ];
-    if (status.preprocess?.summary) {
-        parts.push(`전처리: ${status.preprocess.summary}`);
-    }
-    return parts.join(' | ');
-}
-function redactInternalTerms(s) {
-    let out = s;
-    // Tool names (avoid leaking internal tool identifiers to users)
-    out = out.replace(/\b(vibe_pm|vibecode|spec_high|clinic|bitnet)\.[a-z0-9_]+\b/gi, '내부 도구');
-    out = out.replace(/\b(spec-high|vpm-back|clinic)\b/gi, '내부 엔진');
-    return out;
-}
-function err(toolName, reason, extra) {
-    const msg = redactInternalTerms(extra?.message ?? '요청을 처리하는 중 문제가 생겼습니다.');
-    const recovery = extra?.recovery ? redactInternalTerms(extra.recovery) : undefined;
-    const userTitle = extra?.user_message?.title
-        ? redactInternalTerms(extra.user_message.title)
-        : '요청을 처리할 수 없습니다.';
-    const userMessage = extra?.user_message?.message
-        ? redactInternalTerms(extra.user_message.message)
-        : msg;
-    const out = ToolErrorOutputSchema.parse({
-        status: 'ERROR',
-        reason,
-        schema_version: 'tool_error_output.v2',
-        tool: toolName,
-        error_code: reason,
-        user_message: { title: userTitle, message: userMessage },
-        agent_directive: extra?.agent_directive,
-        loop_policy: extra?.loop_policy,
-        message: msg,
-        recovery,
-        is_retryable: extra?.is_retryable,
-        details: extra?.details,
-        debug: extra?.debug,
-    });
-    return {
-        content: [{ type: 'text', text: JSON.stringify(out, null, 2) }],
-        structuredContent: out,
-        isError: true,
-    };
-}
-function errorResult(toolName, error) {
-    return err(toolName, 'mcp_error', {
-        message: error.message,
-        recovery: '입력 값을 확인한 뒤 다시 시도해 주세요.',
-        is_retryable: false,
-    });
-}
+// Tool Handlers
 // ============================================================
-// DB Sync Helper (P0-1: rail 고정 = 'mcp')
-// ============================================================
-/**
- * MCP tool 성공 시 DB sync 시도 (best-effort)
- *
- * @description
- * 도구 실행 성공 후 호출. 실패해도 도구 결과에 영향 없음.
- * P0-1: rail은 항상 'mcp'로 고정 (환경변수 아님).
- * P0-7: advisory lock으로 race condition 방지.
- *
- * @param toolKind 도구 이름 (briefing, inspect_code 등)
- * @param projectId 프로젝트 ID
- * @param result 도구 결과 객체
- */
-async function tryMcpDbSync(toolKind, projectId, result) {
-    // sync 비활성화 시 skip
-    if (!isDbSyncEnabled())
-        return;
-    try {
-        const basePath = process.cwd();
-        const { run_id } = resolveRunId(projectId, basePath);
-        const workspaceId = generateWorkspaceId(basePath);
-        await syncMcpToolResult({
-            rail: 'mcp', // P0-1: 고정값
-            workspaceId,
-            runId: run_id,
-            toolKind,
-            result,
-        });
-    }
-    catch (err) {
-        // best-effort: 실패해도 도구 응답에 영향 없음
-        // 로그만 남김 (production에서는 structured logging 권장)
-        if (process.env.VIBE_DB_SYNC_DEBUG === '1') {
-            console.warn(`[db_sync] MCP sync failed for ${toolKind}:`, err instanceof Error ? err.message : String(err));
+const vibePmBriefing = createToolHandler({
+    toolName: 'vibe_pm.briefing',
+    inputSchema: briefingInputSchema,
+    outputSchema: briefingOutputSchema,
+    flowPolicyProjectId: input => input.project_id,
+    dbSync: { toolKind: 'briefing', projectId: input => input.project_id },
+    logNamespace: 'vibe-pm/engine',
+    before: (_input, ctx) => {
+        ctx.log.log('info', { tool: 'vibe_pm.briefing' }, 'briefing start');
+    },
+    after: (input, _validated, ctx) => {
+        ctx.log.log('info', { tool: 'vibe_pm.briefing' }, 'briefing done');
+        const runId = getProjectOrRunId(_validated) ?? getProjectOrRunId(input);
+        fsmTransition(runId, ctx.cwd, 'awaiting_action', 'tool_complete', 'briefing done');
+    },
+    handler: (input, ctx) => briefing(input, ctx.progress, ctx.log),
+    error: {
+        code: 'briefing_failed',
+        recovery: '프로젝트 아이디어를 더 구체적으로 설명해보세요.',
+    },
+});
+const vibePmGetDecision = createToolHandler({
+    toolName: 'vibe_pm.get_decision',
+    inputSchema: getDecisionInputSchema,
+    outputSchema: getDecisionOutputSchema,
+    flowPolicyProjectId: input => input.project_id,
+    handler: input => getDecision(input),
+    error: { code: 'get_decision_failed', recovery: '새 프로젝트입니다. 무엇을 만들까요?' },
+});
+const vibePmSubmitDecision = createToolHandler({
+    toolName: 'vibe_pm.submit_decision',
+    inputSchema: submitDecisionInputSchema,
+    outputSchema: submitDecisionOutputSchema,
+    flowPolicyProjectId: input => input.project_id,
+    dbSync: { toolKind: 'submit_decision', projectId: input => input.project_id },
+    after: (input, validated, ctx) => {
+        const runId = getProjectOrRunId(validated) ?? getProjectOrRunId(input);
+        const remaining = readNestedString(validated, 'remaining_decisions');
+        const choice = readNestedString(validated, 'result', 'chosen');
+        if (choice === 'BLOCK' || choice === 'U') {
+            fsmTransition(runId, ctx.cwd, 'blocked', 'decision_made', `submit_decision: ${choice}`);
         }
-    }
-}
-// ============================================================
-// Flow Policy Check
-// ============================================================
-/**
- * Map run_state phase to UxState
- */
-function phaseToUxState(phase, lastReviewStatus) {
-    if (!phase)
-        return 'S0_IDLE';
-    switch (phase) {
-        case 'init':
-        case 'briefing':
-            return 'S2_INTENT_CAPTURING';
-        case 'decision':
-        case 'decision_discovery':
-        case 'decision_cards':
-            return 'S3_DECISION_NEEDED';
-        case 'work_order':
-        case 'ssot':
-        case 'atomic':
-            return 'S4_PLAN_ISSUED';
-        case 'implementation':
-            return 'S5_IMPLEMENTING';
-        case 'review':
-        case 'validating':
-            // Check last review result
-            if (lastReviewStatus === 'GO')
-                return 'S7_GO';
-            if (lastReviewStatus === 'FIX')
-                return 'S8_FIX';
-            if (lastReviewStatus === 'BLOCK')
-                return 'S9_BLOCK';
-            return 'S6_VALIDATING';
-        case 'completed':
-        case 'done':
-            return 'S11_DONE';
-        default:
-            return 'S0_IDLE';
-    }
-}
-/**
- * Check if tool is allowed based on current state
- * Returns null if allowed, CallToolResult error if blocked
- */
-function checkFlowPolicy(toolName, projectId) {
-    // Get current state
-    const basePath = process.cwd();
-    let currentState = 'S0_IDLE';
-    let runId;
-    let ingressState = 'missing';
-    let decisionsMade = 0;
-    let decisionsPending = 0;
-    try {
-        const { run_id, is_new } = resolveRunId(projectId, basePath);
-        runId = run_id;
-        ingressState = getIngressState(run_id, basePath);
-        if (!is_new) {
-            const runState = readRunState(run_id, basePath);
-            currentState = phaseToUxState(runState?.phase, runState?.last_review_status);
-            decisionsMade = runState?.decisions_made ?? 0;
-            decisionsPending = runState?.decisions_pending ?? 0;
+        else if (remaining && parseInt(remaining, 10) > 0) {
+            fsmTransition(runId, ctx.cwd, 'awaiting_action', 'decision_made', `submit_decision: ${choice}, remaining=${remaining}`);
         }
-    }
-    catch {
-        // If we can't read state, assume IDLE
-        currentState = 'S0_IDLE';
-        ingressState = 'missing';
-        decisionsMade = 0;
-        decisionsPending = 0;
-    }
-    // Check policy
-    const result = checkToolAllowed(currentState, toolName, {
-        state: currentState,
-        run_id: runId,
-        project_id: projectId,
-        decisions_made: decisionsMade,
-        decisions_pending: decisionsPending,
-        ingressState,
-        runId,
-    });
-    if (!result.allowed) {
-        const agent_directive = result.reason === 'FLOW_BLOCKED_INGRESS_REQUIRED' && result.suggested_call
-            ? {
-                intent: 'AUTO_RECOVER',
-                missing: [{ id: 'INGRESS', evidence: ['ingress_state!=ready'] }],
-                actions: [
-                    { type: 'RUN_INGRESS', priority: 10, call: result.suggested_call },
-                    { type: 'RETRY_ORIGINAL_TOOL', priority: 90 },
-                ],
-                loop_policy: {
-                    max_attempts: 2,
-                    stop_on: ['FORBIDDEN_PATH', 'BUDGET_EXCEEDED', 'PERMISSION_DENIED'],
-                },
-            }
-            : undefined;
-        return err(toolName, 'flow_blocked', {
-            message: '지금 단계에서는 이 작업을 진행할 수 없습니다.',
-            recovery: '필요한 준비 단계를 먼저 완료한 뒤 다시 시도해 주세요.',
-            is_retryable: false,
-            agent_directive,
-            details: {
-                internal: {
-                    tool: toolName,
-                    state: currentState,
-                    reason: result.reason,
-                    suggested_tool: result.suggested_tool,
-                    suggested_call: result.suggested_call,
-                    recovery: result.recovery,
-                },
-            },
-        });
-    }
-    return null; // Allowed
-}
-// ============================================================
-// Tool Handlers
-// ============================================================
-async function vibePmBriefing(input) {
-    // Flow policy check
-    const flowBlock = checkFlowPolicy('vibe_pm.briefing', input.project_id);
-    if (flowBlock)
-        return flowBlock;
-    try {
-        const result = await briefing(input);
-        const validated = briefingOutputSchema.parse(result);
-        // DB sync (best-effort, P0-1: rail='mcp')
-        await tryMcpDbSync('briefing', input.project_id, validated);
-        return toolResult('vibe_pm.briefing', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.briefing', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.briefing', 'briefing_failed', {
-            message: msg,
-            recovery: '프로젝트 아이디어를 더 구체적으로 설명해보세요.',
-        });
-    }
-}
-async function vibePmGetDecision(input) {
-    // Flow policy check
-    const flowBlock = checkFlowPolicy('vibe_pm.get_decision', input.project_id);
-    if (flowBlock)
-        return flowBlock;
-    try {
-        const result = await getDecision(input);
-        const validated = getDecisionOutputSchema.parse(result);
-        return toolResult('vibe_pm.get_decision', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.get_decision', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.get_decision', 'get_decision_failed', {
-            message: msg,
-            recovery: '새 프로젝트입니다. 무엇을 만들까요?',
-        });
-    }
-}
-async function vibePmSubmitDecision(input) {
-    // Flow policy check
-    const flowBlock = checkFlowPolicy('vibe_pm.submit_decision', input.project_id);
-    if (flowBlock)
-        return flowBlock;
-    try {
-        const result = await submitDecision(input);
-        const validated = submitDecisionOutputSchema.parse(result);
-        // DB sync (best-effort, P0-1: rail='mcp')
-        await tryMcpDbSync('submit_decision', input.project_id, validated);
-        return toolResult('vibe_pm.submit_decision', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.submit_decision', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.submit_decision', 'submit_decision_failed', {
-            message: msg,
-            recovery: '유효한 결재 항목이 있는지 먼저 확인한 뒤 다시 시도해 주세요.',
-        });
-    }
-}
-async function vibePmCreateWorkOrder(input) {
-    // Flow policy check
-    const flowBlock = checkFlowPolicy('vibe_pm.create_work_order', input.project_id);
-    if (flowBlock)
-        return flowBlock;
-    try {
-        const result = await createWorkOrder(input);
-        const validated = createWorkOrderOutputSchema.parse(result);
-        // DB sync (best-effort, P0-1: rail='mcp')
-        await tryMcpDbSync('create_work_order', input.project_id, validated);
-        return toolResult('vibe_pm.create_work_order', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.create_work_order', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.create_work_order', 'create_work_order_failed', {
-            message: msg,
-            recovery: '결재가 모두 완료되었는지 확인한 뒤 다시 시도해 주세요.',
-        });
-    }
-}
-async function vibePmInspectCode(input) {
-    // Flow policy check
-    const flowBlock = checkFlowPolicy('vibe_pm.inspect_code', input.project_id);
-    if (flowBlock)
-        return flowBlock;
-    try {
-        const result = await inspectCodeWithRalph(input, process.cwd());
-        if (isRewindDirective(result)) {
-            return toolResult('vibe_pm.inspect_code', result);
+        else {
+            fsmTransition(runId, ctx.cwd, 'awaiting_action', 'decision_made', `submit_decision: ${choice}, all done`);
         }
-        const validated = inspectCodeOutputSchema.parse(result);
-        // DB sync (best-effort, P0-1: rail='mcp')
-        // inspect_code는 verdict 포함 → syncMcpToolResult에서 gate_verdict 갱신
-        await tryMcpDbSync('inspect_code', input.project_id, validated);
-        return toolResult('vibe_pm.inspect_code', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.inspect_code', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.inspect_code', 'inspect_code_failed', {
-            message: msg,
-            recovery: '작업 지시서를 먼저 생성한 뒤 검수를 다시 시도해 주세요.',
-        });
-    }
-}
-async function vibePmStatus(input) {
-    try {
-        const result = await statusWithRalph(input, process.cwd());
-        // Pass through RewindDirective (rewind.v1) as-is so the caller can auto-recover.
-        if (isRewindDirective(result)) {
-            return toolResult('vibe_pm.status', result);
+    },
+    handler: input => submitDecision(input),
+    error: {
+        code: 'submit_decision_failed',
+        recovery: '유효한 결재 항목이 있는지 먼저 확인한 뒤 다시 시도해 주세요.',
+    },
+});
+const vibePmCreateWorkOrder = createToolHandler({
+    toolName: 'vibe_pm.create_work_order',
+    inputSchema: createWorkOrderInputSchema,
+    outputSchema: createWorkOrderOutputSchema,
+    flowPolicyProjectId: input => input.project_id,
+    dbSync: { toolKind: 'create_work_order', projectId: input => input.project_id },
+    after: (input, validated, ctx) => {
+        const runId = getProjectOrRunId(validated) ?? getProjectOrRunId(input);
+        fsmTransition(runId, ctx.cwd, 'awaiting_action', 'tool_complete', 'work_order created');
+    },
+    handler: input => createWorkOrder(input),
+    error: {
+        code: 'create_work_order_failed',
+        recovery: '결재가 모두 완료되었는지 확인한 뒤 다시 시도해 주세요.',
+    },
+});
+const vibePmInspectCode = createToolHandler({
+    toolName: 'vibe_pm.inspect_code',
+    inputSchema: inspectCodeInputSchema,
+    outputSchema: inspectCodeOutputSchema,
+    flowPolicyProjectId: input => input.project_id,
+    dbSync: { toolKind: 'inspect_code', projectId: input => input.project_id },
+    logNamespace: 'vibe-pm/gate',
+    before: (_input, ctx) => {
+        ctx.log.log('info', { tool: 'vibe_pm.inspect_code' }, 'inspect_code start');
+    },
+    passThrough: result => isRewindDirective(result),
+    after: (input, validated, ctx) => {
+        const verdict = readNestedString(validated, 'review_summary', 'review_result');
+        ctx.log.log('info', { tool: 'vibe_pm.inspect_code', verdict }, 'inspect_code done');
+        const runId = getProjectOrRunId(validated) ?? getProjectOrRunId(input);
+        if (verdict === 'GO') {
+            fsmTransition(runId, ctx.cwd, 'awaiting_action', 'verdict_received', `inspect_code: GO`);
+        }
+        else if (verdict === 'FIX') {
+            fsmTransition(runId, ctx.cwd, 'in_retry', 'verdict_received', `inspect_code: FIX`);
         }
-        const validated = statusOutputSchema.parse(result);
+        else if (verdict === 'BLOCK') {
+            fsmTransition(runId, ctx.cwd, 'blocked', 'verdict_received', `inspect_code: BLOCK`);
+        }
+        else {
+            fsmTransition(runId, ctx.cwd, 'awaiting_gate', 'verdict_received', `inspect_code: ${verdict ?? 'unknown'}`);
+        }
+    },
+    handler: (input, ctx) => inspectCodeWithRalph(input, ctx.workspaceRoot, ctx.progress, ctx.log),
+    error: {
+        code: 'inspect_code_failed',
+        recovery: '작업 지시서를 먼저 생성한 뒤 검수를 다시 시도해 주세요.',
+    },
+});
+const vibePmStatus = createToolHandler({
+    toolName: 'vibe_pm.status',
+    inputSchema: statusInputSchema,
+    outputSchema: statusOutputSchema,
+    passThrough: result => isRewindDirective(result),
+    format: (input, validated, _ctx) => {
         if (input.format === 'summary') {
             return {
                 content: [{ type: 'text', text: formatStatusSummary(validated) }],
-                structuredContent: validated,
+                structuredContent: toStructuredContent(validated),
             };
         }
         return toolResult('vibe_pm.status', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.status', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.status', 'status_failed', {
-            message: msg,
-            recovery: '새 프로젝트입니다. 무엇을 만들까요?',
-        });
-    }
-}
-async function vibePmDoctor(input) {
-    try {
-        const result = await doctor(input);
-        return toolResult('vibe_pm.doctor', result);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.doctor', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.doctor', 'doctor_failed', { message: msg });
-    }
-}
-async function vibePmIngress(input) {
-    try {
-        const result = await ingressWithRalph(input, process.cwd());
-        if (isRewindDirective(result)) {
-            return toolResult('vibe_pm.ingress', result);
-        }
-        const validated = IngressOutputSchema.parse(result);
-        // DB sync (best-effort, P0-1: rail='mcp')
-        await tryMcpDbSync('ingress', input.project_id ?? input.run_id, validated);
-        return toolResult('vibe_pm.ingress', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.ingress', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.ingress', 'ingress_failed', {
-            message: msg,
-            recovery: '다시 시도하거나 workspace_path를 확인하세요.',
-        });
-    }
-}
-async function vibePmMemoryStatus(input) {
-    try {
-        const parsed = MemoryStatusInputSchema.parse(input);
-        const out = await memoryStatus({ workspaceRoot: process.cwd(), input: parsed });
-        const validated = MemoryStatusOutputSchema.parse(out);
-        return toolResult('vibe_pm.memory_status', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.memory_status', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.memory_status', 'memory_status_failed', {
-            message: msg,
-            recovery: '문서 루트 경로를 확인하거나, 문서 인덱스를 먼저 생성/갱신한 뒤 다시 시도해 주세요.',
-        });
-    }
-}
-async function vibePmMemorySync(input) {
-    try {
-        const parsed = MemorySyncInputSchema.parse(input);
-        const out = await memorySync({ workspaceRoot: process.cwd(), input: parsed });
-        const validated = MemorySyncOutputSchema.parse(out);
-        return toolResult('vibe_pm.memory_sync', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.memory_sync', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.memory_sync', 'memory_sync_failed', {
-            message: msg,
-            recovery: 'docs_root 경로를 확인하거나, force_full=true로 재시도하세요.',
-        });
-    }
-}
-async function vibePmMemoryRetrieve(input) {
-    try {
-        const parsed = MemoryRetrieveInputSchema.parse(input);
-        const out = await memoryRetrieve({ workspaceRoot: process.cwd(), input: parsed });
-        const validated = MemoryRetrieveOutputSchema.parse(out);
-        return toolResult('vibe_pm.memory_retrieve', validated);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.memory_retrieve', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.memory_retrieve', 'memory_retrieve_failed', {
-            message: msg,
-            recovery: '문서 루트 경로를 확인하거나, 문서 인덱스를 먼저 생성/갱신한 뒤 다시 시도해 주세요.',
-        });
-    }
-}
-async function vibePmInitDocs(input) {
-    try {
-        const parsed = InitDocsInputSchema.parse(input);
-        const result = await initDocs(parsed);
-        return toolResult('vibe_pm.init_docs', result);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.init_docs', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.init_docs', 'init_docs_failed', {
-            message: msg,
-            recovery: 'workspace_path를 확인하세요.',
-        });
-    }
-}
-async function vibePmMemory(input) {
-    try {
-        const parsed = MemoryInputSchema.parse(input);
-        const out = await memory({ workspaceRoot: process.cwd(), input: parsed });
-        return toolResult('vibe_pm.memory', out);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.memory', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.memory', 'memory_failed', {
-            message: msg,
-            recovery: 'mode 파라미터를 확인하세요 (status/sync/retrieve).',
-        });
-    }
-}
+    },
+    handler: (input, ctx) => statusWithRalph(input, ctx.workspaceRoot),
+    error: { code: 'status_failed', recovery: '새 프로젝트입니다. 무엇을 만들까요?' },
+});
+const vibePmDoctor = createToolHandler({
+    toolName: 'vibe_pm.doctor',
+    inputSchema: DoctorInputSchema,
+    handler: input => doctor(input),
+    error: { code: 'doctor_failed' },
+});
+const vibePmIngress = createToolHandler({
+    toolName: 'vibe_pm.ingress',
+    inputSchema: IngressInputSchema,
+    outputSchema: IngressOutputSchema,
+    passThrough: result => isRewindDirective(result),
+    dbSync: {
+        toolKind: 'ingress',
+        projectId: input => getProjectOrRunId(input),
+    },
+    handler: (input, ctx) => ingressWithRalph(input, ctx.cwd),
+    error: { code: 'ingress_failed', recovery: '다시 시도하거나 workspace_path를 확인하세요.' },
+});
+const vibePmMemoryStatus = createToolHandler({
+    toolName: 'vibe_pm.memory_status',
+    inputSchema: MemoryStatusInputSchema,
+    outputSchema: MemoryStatusOutputSchema,
+    handler: (input, ctx) => memoryStatus({ workspaceRoot: ctx.cwd, input }),
+    error: {
+        code: 'memory_status_failed',
+        recovery: '문서 루트 경로를 확인하거나, 문서 인덱스를 먼저 생성/갱신한 뒤 다시 시도해 주세요.',
+    },
+});
+const vibePmMemorySync = createToolHandler({
+    toolName: 'vibe_pm.memory_sync',
+    inputSchema: MemorySyncInputSchema,
+    outputSchema: MemorySyncOutputSchema,
+    handler: (input, ctx) => memorySync({ workspaceRoot: ctx.cwd, input }),
+    error: { code: 'memory_sync_failed', recovery: 'docs_root 경로를 확인하거나, force_full=true로 재시도하세요.' },
+});
+const vibePmMemoryRetrieve = createToolHandler({
+    toolName: 'vibe_pm.memory_retrieve',
+    inputSchema: MemoryRetrieveInputSchema,
+    outputSchema: MemoryRetrieveOutputSchema,
+    handler: (input, ctx) => memoryRetrieve({ workspaceRoot: ctx.cwd, input }),
+    error: {
+        code: 'memory_retrieve_failed',
+        recovery: '문서 루트 경로를 확인하거나, 문서 인덱스를 먼저 생성/갱신한 뒤 다시 시도해 주세요.',
+    },
+});
+const vibePmInitDocs = createToolHandler({
+    toolName: 'vibe_pm.init_docs',
+    inputSchema: InitDocsInputSchema,
+    handler: input => initDocs(input),
+    error: { code: 'init_docs_failed', recovery: 'workspace_path를 확인하세요.' },
+});
+const vibePmMemory = createToolHandler({
+    toolName: 'vibe_pm.memory',
+    inputSchema: MemoryInputSchema,
+    handler: (input, ctx) => memory({ workspaceRoot: ctx.cwd, input }),
+    error: { code: 'memory_failed', recovery: 'mode 파라미터를 확인하세요 (status/sync/retrieve).' },
+});
 // ============================================================
 // Scaffold Tool
 // ============================================================
-async function vibePmScaffold(input) {
-    try {
-        const parsed = ScaffoldInputSchema.parse(input);
-        const result = await scaffold(parsed);
-        return toolResult('vibe_pm.scaffold', result);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.scaffold', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.scaffold', 'scaffold_failed', {
-            message: msg,
-            recovery: 'target_dir와 template 파라미터를 확인하세요.',
-        });
-    }
-}
+const vibePmScaffold = createToolHandler({
+    toolName: 'vibe_pm.scaffold',
+    inputSchema: ScaffoldInputSchema,
+    handler: input => scaffold(input),
+    error: { code: 'scaffold_failed', recovery: 'target_dir와 template 파라미터를 확인하세요.' },
+});
+const vibePmAgent = createToolHandler({
+    toolName: 'vibe_pm.agent',
+    inputSchema: AgentInputSchema,
+    handler: input => agentTool(input),
+    error: { code: 'agent_failed', recovery: 'mode와 agent_id 파라미터를 확인하세요.' },
+});
+const vibePmWorkspaceRecipe = createToolHandler({
+    toolName: 'vibe_pm.workspace_recipe',
+    inputSchema: WorkspaceRecipeInputSchema,
+    handler: input => workspaceRecipe(input),
+    error: { code: 'workspace_recipe_failed', recovery: 'recipe_id와 target_dir를 확인하세요.' },
+});
 // ============================================================
 // Setup Tool (One-click MCP configuration)
 // ============================================================
-async function vibePmSetup(input) {
-    try {
-        const parsed = SetupInputSchema.parse(input);
-        const result = await setup(parsed);
-        return toolResult('vibe_pm.setup', result);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.setup', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.setup', 'setup_failed', {
-            message: msg,
-            recovery: 'mode 파라미터를 확인하세요 (check/install/uninstall).',
-        });
-    }
-}
+const vibePmSetup = createToolHandler({
+    toolName: 'vibe_pm.setup',
+    inputSchema: SetupInputSchema,
+    handler: input => setup(input),
+    error: {
+        code: 'setup_failed',
+        recovery: 'mode 파라미터를 확인하세요 (check/install/uninstall).',
+    },
+});
 // ============================================================
 // UI Tools (XT Apps)
 // ============================================================
-async function vibePmUIManifest(input) {
-    try {
-        const cwd = process.cwd();
-        // Resolve run directory
-        let runDir;
-        if (input.run_id) {
-            runDir = `${cwd}/.vibe/runs/${input.run_id}`;
-        }
-        else {
-            // Find latest run
-            const runsDir = `${cwd}/.vibe/runs`;
-            const fs = await import('node:fs/promises');
-            const path = await import('node:path');
-            try {
-                const runs = await fs.readdir(runsDir);
-                if (runs.length === 0) {
-                    return err('vibe_pm.ui_manifest', 'no_runs', {
-                        message: 'No runs found',
-                        recovery: 'Run vibe_pm.briefing first to create a project.',
-                    });
-                }
-                // Sort by modification time
-                const sorted = await Promise.all(runs.map(async (r) => ({
-                    name: r,
-                    mtime: (await fs.stat(path.join(runsDir, r))).mtime.getTime(),
-                })));
-                sorted.sort((a, b) => b.mtime - a.mtime);
-                runDir = path.join(runsDir, sorted[0].name);
-            }
-            catch {
-                return err('vibe_pm.ui_manifest', 'no_runs', {
-                    message: 'No runs directory found',
-                    recovery: 'Run vibe_pm.briefing first.',
-                });
-            }
-        }
+const vibePmUIManifest = createToolHandler({
+    toolName: 'vibe_pm.ui_manifest',
+    inputSchema: UIManifestInputSchema,
+    handler: async (input) => {
+        const runDir = await resolveRunDir(input.run_id);
         const manifest = await loadUIManifest(runDir);
         if (!manifest) {
-            return err('vibe_pm.ui_manifest', 'no_manifest', {
-                message: 'UI manifest not found',
-                recovery: 'Run vibe_pm.inspect_code with renderSvg=true to generate diagram viewer.',
-            });
-        }
-        return toolResult('vibe_pm.ui_manifest', {
-            manifest,
-            run_dir: runDir,
-        });
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.ui_manifest', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.ui_manifest', 'manifest_failed', {
-            message: msg,
-            recovery: 'run_id를 확인하세요.',
-        });
-    }
-}
-async function vibePmUIResource(input) {
-    try {
-        const cwd = process.cwd();
-        // Resolve run directory (same logic as ui_manifest)
-        let runDir;
-        if (input.run_id) {
-            runDir = `${cwd}/.vibe/runs/${input.run_id}`;
-        }
-        else {
-            const runsDir = `${cwd}/.vibe/runs`;
-            const fs = await import('node:fs/promises');
-            const path = await import('node:path');
-            try {
-                const runs = await fs.readdir(runsDir);
-                if (runs.length === 0) {
-                    return err('vibe_pm.ui_resource', 'no_runs', {
-                        message: 'No runs found',
-                        recovery: 'Run vibe_pm.briefing first.',
-                    });
-                }
-                const sorted = await Promise.all(runs.map(async (r) => ({
-                    name: r,
-                    mtime: (await fs.stat(path.join(runsDir, r))).mtime.getTime(),
-                })));
-                sorted.sort((a, b) => b.mtime - a.mtime);
-                runDir = path.join(runsDir, sorted[0].name);
-            }
-            catch {
-                return err('vibe_pm.ui_resource', 'no_runs', {
-                    message: 'No runs directory found',
-                    recovery: 'Run vibe_pm.briefing first.',
-                });
-            }
+            throw new Error('UI manifest not found. Run inspect_code with renderSvg=true to generate.');
         }
+        return { manifest, run_dir: runDir };
+    },
+    error: { code: 'manifest_failed', recovery: 'run_id를 확인하세요.' },
+});
+const vibePmUIResource = createToolHandler({
+    toolName: 'vibe_pm.ui_resource',
+    inputSchema: UIResourceInputSchema,
+    handler: async (input) => {
+        const runDir = await resolveRunDir(input.run_id);
         const { resource, content } = await loadResource(runDir, input.resource_id);
-        if (!resource) {
-            return err('vibe_pm.ui_resource', 'not_found', {
-                message: `Resource '${input.resource_id}' not found`,
-                recovery: 'Check ui_manifest for available resources.',
-            });
-        }
-        if (content === null) {
-            return err('vibe_pm.ui_resource', 'read_failed', {
-                message: `Failed to read resource content`,
-                recovery: 'Resource file may have been deleted.',
-            });
-        }
-        const contentType = {
-            html: 'text/html',
-            svg: 'image/svg+xml',
-            json: 'application/json',
-        }[resource.type] ?? 'text/plain';
-        return toolResult('vibe_pm.ui_resource', {
-            resource,
-            content,
-            content_type: contentType,
-        });
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.ui_resource', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.ui_resource', 'resource_failed', {
-            message: msg,
-            recovery: 'resource_id를 확인하세요.',
-        });
-    }
-}
+        if (!resource)
+            throw new Error(`Resource '${input.resource_id}' not found`);
+        if (content === null)
+            throw new Error('Failed to read resource content');
+        const contentType = { html: 'text/html', svg: 'image/svg+xml', json: 'application/json' }[resource.type] ??
+            'text/plain';
+        return { resource, content, content_type: contentType };
+    },
+    error: { code: 'resource_failed', recovery: 'resource_id를 확인하세요.' },
+});
 // ============================================================
 // Worker MCP Tools (Phase 13)
 // ============================================================
-async function vibePmSubmitTask(input) {
-    try {
-        const parsed = submitTaskInputSchema.parse(input);
-        const result = await submitTask(parsed);
-        return toolResult('vibe_pm.submit_task', result);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.submit_task', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.submit_task', 'submit_task_failed', {
-            message: msg,
-            recovery: 'worker_type과 inputs를 확인하세요.',
-        });
-    }
-}
-async function vibePmWorkerStatus(input) {
-    try {
-        const parsed = workerStatusInputSchema.parse(input);
-        const result = await workerStatus(parsed);
-        return toolResult('vibe_pm.worker_status', result);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.worker_status', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.worker_status', 'worker_status_failed', {
-            message: msg,
-            recovery: 'task_id 또는 worker_type을 확인하세요.',
-        });
-    }
-}
-async function vibePmGetResult(input) {
-    try {
-        const parsed = getResultInputSchema.parse(input);
-        const result = await getResult(parsed);
-        return toolResult('vibe_pm.get_result', result);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.get_result', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.get_result', 'get_result_failed', {
-            message: msg,
-            recovery: 'task_id를 확인하세요.',
-        });
-    }
-}
-async function vibePmDashboard(input) {
-    try {
-        const parsed = dashboardInputSchema.parse(input);
-        const result = await dashboard(parsed);
-        return toolResult('vibe_pm.dashboard', result);
-    }
-    catch (e) {
-        if (e instanceof McpError)
-            return errorResult('vibe_pm.dashboard', e);
-        const msg = e instanceof Error ? e.message : String(e);
-        return err('vibe_pm.dashboard', 'dashboard_failed', {
-            message: msg,
-            recovery: 'project_id를 확인하세요.',
-        });
-    }
-}
+const vibePmSubmitTask = createToolHandler({
+    toolName: 'vibe_pm.submit_task',
+    inputSchema: submitTaskInputSchema,
+    handler: input => submitTask(input),
+    error: { code: 'submit_task_failed', recovery: 'worker_type과 inputs를 확인하세요.' },
+});
+const vibePmWorkerStatus = createToolHandler({
+    toolName: 'vibe_pm.worker_status',
+    inputSchema: workerStatusInputSchema,
+    handler: input => workerStatus(input),
+    error: { code: 'worker_status_failed', recovery: 'task_id 또는 worker_type을 확인하세요.' },
+});
+const vibePmGetResult = createToolHandler({
+    toolName: 'vibe_pm.get_result',
+    inputSchema: getResultInputSchema,
+    handler: input => getResult(input),
+    error: { code: 'get_result_failed', recovery: 'task_id를 확인하세요.' },
+});
+const vibePmDashboard = createToolHandler({
+    toolName: 'vibe_pm.dashboard',
+    inputSchema: dashboardInputSchema,
+    handler: input => dashboard(input),
+    error: { code: 'dashboard_failed', recovery: 'project_id를 확인하세요.' },
+});
+// ============================================================
+// Scout Tool (BitNet trigger dispatch)
+// ============================================================
+const vibePmScout = createToolHandler({
+    toolName: 'vibe_pm.scout',
+    inputSchema: ScoutInputSchema,
+    outputSchema: ScoutOutputSchema,
+    logNamespace: 'vibe-pm/agent',
+    before: (_input, ctx) => {
+        ctx.log.log('info', { tool: 'vibe_pm.scout' }, 'scout start');
+    },
+    after: (_input, validated, ctx) => {
+        const triggered = typeof validated === 'object' && validated !== null
+            ? validated.triggered
+            : undefined;
+        ctx.log.log('info', { tool: 'vibe_pm.scout', triggered }, 'scout done');
+    },
+    handler: (input, ctx) => scout(input, ctx.progress, ctx.log),
+    error: {
+        code: 'scout_failed',
+        recovery: 'trigger_id를 확인하거나 auto 모드로 다시 시도하세요.',
+    },
+});
+// ============================================================
+// Decision History Tool (Maintain stage — permanent decision log)
+// ============================================================
+const vibePmDecisionHistory = createToolHandler({
+    toolName: 'vibe_pm.decision_history',
+    inputSchema: DecisionHistoryInputSchema,
+    handler: input => decisionHistory(input),
+    error: { code: 'decision_history_failed', recovery: 'action과 필터를 확인하세요 (query/compact).' },
+});
+// ============================================================
+// Block Search Tool (P38 — DB FTS)
+// ============================================================
+const vibePmBlockSearch = createToolHandler({
+    toolName: 'vibe_pm.block_search',
+    inputSchema: blockSearchInputSchema,
+    handler: input => blockSearch(input),
+    error: { code: 'block_search_failed', recovery: 'query 또는 mode를 확인하세요.' },
+});
+// ============================================================
+// Block Events Tool (Sprint 1 — Signal polling)
+// ============================================================
+const vibePmBlockEvents = createToolHandler({
+    toolName: 'vibe_pm.block_events',
+    inputSchema: blockEventsInputSchema,
+    handler: input => blockEvents(input),
+    error: { code: 'block_events_failed', recovery: 'mode 또는 cursor를 확인하세요.' },
+});
+// ============================================================
+// Block Snapshot Tool (Sprint 4 — Snapshot/Restore)
+// ============================================================
+const vibePmBlockSnapshot = createToolHandler({
+    toolName: 'vibe_pm.block_snapshot',
+    inputSchema: blockSnapshotInputSchema,
+    handler: input => blockSnapshot(input),
+    error: { code: 'block_snapshot_failed', recovery: 'mode 또는 snapshot_id를 확인하세요.' },
+});
+// ============================================================
+// Skills Tool
+// ============================================================
+const vibePmSkills = createToolHandler({
+    toolName: 'vibe_pm.skills',
+    inputSchema: skillsInputSchema,
+    handler: input => skills(input),
+    error: { code: 'skills_failed', recovery: 'mode를 확인하세요 (list/detail).' },
+});
+// ============================================================
+// Suggest Roots Tool
+// ============================================================
+const vibePmSuggestRoots = createToolHandler({
+    toolName: 'vibe_pm.suggest_roots',
+    inputSchema: suggestRootsInputSchema,
+    handler: input => suggestRoots(input),
+    error: { code: 'suggest_roots_failed', recovery: 'scan_path를 확인하세요.' },
+});
+// ============================================================
+// Check Resources Tool
+// ============================================================
+const vibePmCheckResources = createToolHandler({
+    toolName: 'vibe_pm.check_resources',
+    inputSchema: checkResourcesInputSchema,
+    handler: input => checkResources(input),
+    error: { code: 'check_resources_failed' },
+});
+// ============================================================
+// Check Dormant Tool
+// ============================================================
+const vibePmCheckDormant = createToolHandler({
+    toolName: 'vibe_pm.check_dormant',
+    inputSchema: checkDormantInputSchema,
+    handler: input => checkDormant(input),
+    error: { code: 'check_dormant_failed', recovery: 'workspace_root를 확인하세요.' },
+});
+// ============================================================
+// Repair Plan Tool
+// ============================================================
+const vibePmRepairPlan = createToolHandler({
+    toolName: 'vibe_pm.repair_plan',
+    inputSchema: repairPlanInputSchema,
+    handler: input => repairPlan(input),
+    error: { code: 'repair_plan_failed', recovery: 'inspect_code를 먼저 실행하세요.' },
+});
+// ============================================================
+// Finalize Work Tool
+// ============================================================
+const vibePmFinalizeWork = createToolHandler({
+    toolName: 'vibe_pm.finalize_work',
+    inputSchema: finalizeWorkInputSchema,
+    handler: input => finalizeWork(input),
+    error: { code: 'finalize_work_failed', recovery: 'workspace_root를 확인하세요.' },
+});
+// ============================================================
+// Undo Last Task Tool
+// ============================================================
+const vibePmUndoLastTask = createToolHandler({
+    toolName: 'vibe_pm.undo_last_task',
+    inputSchema: undoLastTaskInputSchema,
+    handler: input => undoLastTask(input),
+    error: { code: 'undo_last_task_failed', recovery: 'GO 판정 기록이 있는지 확인하세요.' },
+});
+// ============================================================
+// Branch Pivot Tool
+// ============================================================
+const vibePmBranchPivot = createToolHandler({
+    toolName: 'vibe_pm.branch_pivot',
+    inputSchema: branchPivotInputSchema,
+    handler: input => branchPivot(input),
+    error: { code: 'branch_pivot_failed', recovery: 'target_branch를 확인하세요.' },
+});
 // ============================================================
 // Export
 // ============================================================
-export function defineVibePmTools() {
+export function defineVibePmTools(opts) {
+    // NOTE: defineVibePmTools can be called multiple times (tests/spawn). Keep it idempotent.
+    // The deps are optional and are used as a best-effort basePath SSOT for tools.
+    setKernelDepsForTools(opts?.kernelDeps);
     return {
         // Input schemas
         briefingInputSchema,
@@ -766,11 +479,26 @@ export function defineVibePmTools() {
         uiManifestInputSchema: UIManifestInputSchema,
         uiResourceInputSchema: UIResourceInputSchema,
         scaffoldInputSchema: ScaffoldInputSchema,
+        agentInputSchema: AgentInputSchema,
+        workspaceRecipeInputSchema: WorkspaceRecipeInputSchema,
         setupInputSchema: SetupInputSchema,
         submitTaskInputSchema,
         workerStatusInputSchema,
         getResultInputSchema,
         dashboardInputSchema,
+        scoutInputSchema: ScoutInputSchema,
+        blockSearchInputSchema,
+        blockEventsInputSchema,
+        blockSnapshotInputSchema,
+        decisionHistoryInputSchema: DecisionHistoryInputSchema,
+        skillsInputSchema,
+        suggestRootsInputSchema,
+        checkResourcesInputSchema,
+        checkDormantInputSchema,
+        repairPlanInputSchema,
+        finalizeWorkInputSchema,
+        undoLastTaskInputSchema,
+        branchPivotInputSchema,
         // Tool handlers
         vibePmBriefing,
         vibePmGetDecision,
@@ -788,50 +516,32 @@ export function defineVibePmTools() {
         vibePmUIManifest,
         vibePmUIResource,
         vibePmScaffold,
+        vibePmAgent,
+        vibePmWorkspaceRecipe,
         vibePmSetup,
         vibePmSubmitTask,
         vibePmWorkerStatus,
         vibePmGetResult,
         vibePmDashboard,
+        vibePmScout,
+        vibePmBlockSearch,
+        vibePmBlockEvents,
+        vibePmBlockSnapshot,
+        vibePmDecisionHistory,
+        vibePmSkills,
+        vibePmSuggestRoots,
+        vibePmCheckResources,
+        vibePmCheckDormant,
+        vibePmRepairPlan,
+        vibePmFinalizeWork,
+        vibePmUndoLastTask,
+        vibePmBranchPivot,
         // Docs structure helper
         ensureDocsStructure,
     };
 }
 // ============================================================
-// Tool Descriptions
-// ============================================================
-export const VIBE_PM_TOOL_DESCRIPTIONS = {
-    'vibe_pm.status': '프로젝트 상태 조회.',
-    'vibe_pm.briefing': '프로젝트 시작/재개. 사용자 아이디어 구조화.',
-    'vibe_pm.get_decision': '결재 안건 조회. 구현 전 승인 필요 시.',
-    'vibe_pm.submit_decision': '결재 제출. 선택지(A/B/C/U) 선택 후.',
-    'vibe_pm.create_work_order': '작업 지시서 발행. 결재 완료 후 구현 전.',
-    'vibe_pm.inspect_code': '코드 검수. auto_fix로 의존성 자동 수정.',
-    'vibe_pm.doctor': '설치 점검 + 자동 수정.',
-    'vibe_pm.ingress': 'Ingress 산출물 생성/갱신. 컨텍스트 스캔.',
-    'vibe_pm.setup': 'Claude Code MCP 설정 자동화. mode: check(상태확인), install(설치), uninstall(제거).',
-    'vibe_pm.memory': '통합 메모리 도구. mode: status(상태조회), sync(인덱스생성), retrieve(문서검색).',
-    'vibe_pm.memory_status': '[Tier 3] 로컬 문서 인덱스(메모리) 상태 조회. vibe_pm.memory(mode=status) 권장.',
-    'vibe_pm.memory_sync': '[Tier 3] 로컬 문서 인덱스(메모리) 생성/갱신. vibe_pm.memory(mode=sync) 권장.',
-    'vibe_pm.memory_retrieve': '[Tier 3] 로컬 문서 인덱스(메모리)에서 관련 컨텍스트 추출. vibe_pm.memory(mode=retrieve) 권장.',
-    'vibe_pm.init_docs': '[Tier 3] docs/ 폴더 구조 초기화. active/reference/archived 구조 생성. 초기 1회 실행.',
-    'vibe_pm.scaffold': '프로젝트 구조 생성/동화/스캔. mode: scaffold(새 프로젝트), assimilate(기존 프로젝트 동화), scan(구조 스캔).',
-    'vibe_pm.ui_manifest': '[P2] UI 리소스 매니페스트 조회. 사용 가능한 UI 목록 반환.',
-    'vibe_pm.ui_resource': '[P2] UI 리소스 반환. resource_id로 HTML/SVG/JSON 콘텐츠 조회.',
-    'vibe_pm.submit_task': 'Worker에 비동기 작업 제출. worker_type: browser/search/fs/build/model.',
-    'vibe_pm.worker_status': 'Worker 또는 작업 상태 조회. task_id 또는 worker_type으로 조회.',
-    'vibe_pm.get_result': '완료된 작업 결과 조회. task_id로 결과 및 아티팩트 조회.',
-    'vibe_pm.dashboard': 'Worker 대시보드 조회. format: summary/json/html. 풀/오토스케일링 상태 포함.',
-};
-// Re-export ingress helpers
-export { getIngressState, checkIngressArtifacts };
-// Re-export feature flags
-export { getFeatureFlags, isIngressRequired, isObserverEnabled, getObserverMode, isWatcherEnabled, getFeatureFlagsStatus, };
-// Re-export observer
-export { SoftObserver, getObserver, startObserverIfEnabled, stopObserver, getObserverStatusFn as getObserverStatus, runDeltaScan, quickDirtyCheck, };
-// Re-export bitnet cache
-export { readLastCheck, writeLastCheck, appendHistory, readHistory, validateSource, validateLastCheck, cacheExists, clearCache, getCacheStatus, getCacheDir, getLastCheckPath, getHistoryPath, } from './bitnet-cache.js';
-// Re-export mapping guard
-export { runMappingPipeline, hasSpecMap, hasChangeMap, loadChangeMap, loadSpecMap, scanChangedFiles, scanStagedFiles, scanImportHints, buildChangeMap, buildSkeletonMapPatch, mergeSkeletonMapPatch, judgeMappingGate, } from './mapping/index.js';
-// Re-export bitnet hook consumer
-export { consumeForHook, getShortMessage, getDetailedMessage, shouldBlockHook, getVerdict, preCheckHook, postCheckHook, ciGateHook, } from './bitnet-hook-consumer.js';
+// Tool Descriptions (re-exported from extracted module)
+// ============================================================
+export { VIBE_PM_TOOL_DESCRIPTIONS } from './tool_descriptions.js';
+export { getIngressState, checkIngressArtifacts, getFeatureFlags, isIngressRequired, isObserverEnabled, getObserverMode, isWatcherEnabled, getFeatureFlagsStatus, SoftObserver, getObserver, startObserverIfEnabled, stopObserver, getObserverStatus, runDeltaScan, quickDirtyCheck, readLastCheck, writeLastCheck, appendHistory, readHistory, validateSource, validateLastCheck, cacheExists, clearCache, getCacheStatus, getCacheDir, getLastCheckPath, getHistoryPath, hasSpecMap, hasChangeMap, loadChangeMap, loadSpecMap, scanChangedFiles, scanStagedFiles, scanImportHints, buildChangeMap, buildSkeletonMapPatch, mergeSkeletonMapPatch, judgeMappingGate, consumeForHook, getShortMessage, getDetailedMessage, shouldBlockHook, getVerdict, preCheckHook, postCheckHook, ciGateHook, } from './reexports.js';