patchwarden 1.5.1 → 1.6.2

package/dist/tools/{schemaDriftCheck.js → diagnostics/schemaDriftCheck.js}

@@ -6,8 +6,8 @@
  *
  * 本模块只做检测和报告，不做运行时阻断。
  */
-import { computeSchemaDigest } from "./toolRegistry.js";
-import { CHATGPT_CORE_TOOL_NAMES } from "./toolCatalog.js";
+import { computeSchemaDigest } from "../catalog/toolRegistry.js";
+import { CHATGPT_CORE_TOOL_NAMES } from "../catalog/toolCatalog.js";
 /** chatgpt_core profile 的预期工具数（来自 CHATGPT_CORE_TOOL_NAMES）。 */
 const EXPECTED_CORE_COUNT = CHATGPT_CORE_TOOL_NAMES.length;
 // ── 检查 1: registry schema digest 一致性 ─────────────────────────

package/dist/tools/{createDirectSession.js → direct/createDirectSession.js}

@@ -1,10 +1,10 @@
 import { existsSync, statSync } from "node:fs";
-import { getConfig } from "../config.js";
-import { PatchWardenError } from "../errors.js";
-import { guardWorkspacePath } from "../security/pathGuard.js";
-import { guardRuntimeSelfModification } from "../security/runtimeGuard.js";
-import { captureRepoSnapshot } from "../runner/changeCapture.js";
-import { createDirectSession as createDirectSessionRecord, } from "../direct/directSessionStore.js";
+import { getConfig } from "../../config.js";
+import { PatchWardenError } from "../../errors.js";
+import { guardWorkspacePath } from "../../security/pathGuard.js";
+import { guardRuntimeSelfModification } from "../../security/runtimeGuard.js";
+import { captureRepoSnapshot } from "../../runner/changeCapture.js";
+import { createDirectSession as createDirectSessionRecord, } from "../../direct/directSessionStore.js";
 // ── Tool implementation ────────────────────────────────────────────
 export async function createDirectSession(input) {
     const config = getConfig();

package/dist/tools/{finalizeDirectSession.d.ts → direct/finalizeDirectSession.d.ts}

@@ -1,4 +1,4 @@
-import { type ClassifiedChange } from "../runner/changeCapture.js";
+import { type ClassifiedChange } from "../../runner/changeCapture.js";
 export interface FinalizeDirectSessionInput {
     session_id: string;
 }

package/dist/tools/direct/finalizeDirectSession.js

@@ -0,0 +1,86 @@
+import { join, resolve, relative, isAbsolute } from "node:path";
+import { readDirectSession, finalizeDirectSessionRecord, getDirectSessionDir, withDirectSessionMutationLockAsync, } from "../../direct/directSessionStore.js";
+import { guardDirectSessionActive } from "../../direct/directGuards.js";
+import { captureRepoSnapshot, buildChangeArtifacts, } from "../../runner/changeCapture.js";
+// ── Main function ──────────────────────────────────────────────────
+export async function finalizeDirectSession(input) {
+    const { session_id } = input;
+    return withDirectSessionMutationLockAsync(session_id, async () => {
+        // 1. Read session and guard active (not expired, not finalized)
+        const session = readDirectSession(session_id);
+        guardDirectSessionActive(session);
+        // 2. Capture after snapshot
+        const afterSnapshot = await captureRepoSnapshot(session.resolved_repo_path);
+        // 3. Build change artifacts from before/after snapshots
+        const changeArtifacts = await buildChangeArtifacts(session.resolved_repo_path, session.workspace_snapshot_before, afterSnapshot);
+        // 4. Finalize session record — writes changed-files.json, diff.patch,
+        //    summary.json, summary.md and marks the session as finalized.
+        finalizeDirectSessionRecord(session_id, changeArtifacts);
+        // 5. Build verification summary from session.verification_runs
+        const verification_summary = {};
+        for (const run of session.verification_runs) {
+            verification_summary[run.command] = run.passed ? "passed" : "failed";
+        }
+        // 6. Identify out-of-scope changes (paths outside resolved_repo_path)
+        const out_of_scope_changes = findOutOfScopeChanges(changeArtifacts, session.resolved_repo_path);
+        // 7. Build compact summary with categorized changes
+        const sessionDir = getDirectSessionDir(session_id);
+        return {
+            session_id,
+            changed_files_total: changeArtifacts.changed_files.length,
+            source_changes: changeArtifacts.artifact_hygiene.source_changes,
+            tracked_build_artifacts: changeArtifacts.artifact_hygiene.tracked_build_artifacts,
+            runtime_generated_files: changeArtifacts.artifact_hygiene.runtime_generated_files,
+            suspicious_changes: changeArtifacts.artifact_hygiene.suspicious_changes,
+            out_of_scope_changes,
+            verification_summary,
+            diff_path: join(sessionDir, "diff.patch"),
+            summary_path: join(sessionDir, "summary.md"),
+            finalized: true,
+            next_action: "Call audit_session to independently review the changes.",
+        };
+    });
+}
+// ── Helpers ────────────────────────────────────────────────────────
+/**
+ * Filter changeArtifacts.changed_files for paths that resolve outside the
+ * session's resolved_repo_path and map them to ClassifiedChange format.
+ */
+function findOutOfScopeChanges(artifacts, resolvedRepoPath) {
+    const normalizedRepo = resolve(resolvedRepoPath);
+    return artifacts.changed_files
+        .filter((file) => {
+        const fullPath = resolve(normalizedRepo, file.path);
+        const rel = relative(normalizedRepo, fullPath);
+        return isAbsolute(rel) || rel.startsWith("..");
+    })
+        .map((file) => toClassifiedChange(file));
+}
+/**
+ * Map a ChangedFile to the ClassifiedChange format by adding a reason string.
+ */
+function toClassifiedChange(file) {
+    return {
+        path: file.path,
+        change: file.change,
+        tracked: file.tracked,
+        ignored: file.ignored,
+        kind: file.kind,
+        reason: classificationReason(file),
+    };
+}
+/**
+ * Produce a human-readable reason for a changed file classification.
+ * Mirrors the logic in changeCapture.ts classifyArtifactHygiene.
+ */
+function classificationReason(change) {
+    if (change.ignored)
+        return "untracked path is ignored by repository Git rules";
+    if (change.kind === "build_artifact" && change.tracked)
+        return "artifact-like path is tracked by Git and requires review";
+    if (change.kind === "build_artifact")
+        return "artifact-like path is not ignored and requires review";
+    if (change.kind === "runtime_generated")
+        return "runtime-generated path is not ignored and requires review";
+    return change.tracked ? "tracked source change" : "untracked source change";
+}

package/dist/tools/direct/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./createDirectSession.js";
+export * from "./finalizeDirectSession.js";
+export * from "./runDirectVerificationBundle.js";

package/dist/tools/direct/index.js

@@ -0,0 +1,3 @@
+export * from "./createDirectSession.js";
+export * from "./finalizeDirectSession.js";
+export * from "./runDirectVerificationBundle.js";

package/dist/tools/{runDirectVerificationBundle.js → direct/runDirectVerificationBundle.js}

@@ -1,5 +1,5 @@
-import { getConfig } from "../config.js";
-import { runVerification } from "./runVerification.js";
+import { getConfig } from "../../config.js";
+import { runVerification } from "../tasks/runVerification.js";
 export async function runDirectVerificationBundle(input) {
     const normalized = normalizeInput(input);
     const results = [];

package/dist/tools/{discoverTools.d.ts → discovery/discoverTools.d.ts}

@@ -6,6 +6,6 @@
  * v0.8.1: 为每个搜索结果生成 discoveryToken（server-side 保存）。
  * v0.9.0: 传入 usageStatsProvider，从 invocation.log 聚合历史成功率用于混合排序。
  */
-import type { ToolDef } from "./registry.js";
-import { discoverTools as searchDiscover, type DiscoverToolsInput } from "./toolSearch.js";
+import type { ToolDef } from "../registry.js";
+import { discoverTools as searchDiscover, type DiscoverToolsInput } from "../catalog/toolSearch.js";
 export declare function discoverTools(input: DiscoverToolsInput, tools: ToolDef[]): ReturnType<typeof searchDiscover>;

package/dist/tools/{discoverTools.js → discovery/discoverTools.js}

@@ -7,11 +7,11 @@
  * v0.9.0: 传入 usageStatsProvider，从 invocation.log 聚合历史成功率用于混合排序。
  */
 import { join } from "node:path";
-import { buildToolRegistry } from "./toolRegistry.js";
-import { discoverTools as searchDiscover } from "./toolSearch.js";
-import { issueToken } from "../security/discoveryTokenStore.js";
-import { aggregateUsageStats } from "./toolUsageStats.js";
-import { getConfig } from "../config.js";
+import { buildToolRegistry } from "../catalog/toolRegistry.js";
+import { discoverTools as searchDiscover } from "../catalog/toolSearch.js";
+import { issueToken } from "../../security/discoveryTokenStore.js";
+import { aggregateUsageStats } from "../catalog/toolUsageStats.js";
+import { getConfig } from "../../config.js";
 export function discoverTools(input, tools) {
     const registry = buildToolRegistry(tools);
     // v0.9.0: 从 invocation.log 聚合历史成功率，用于混合排序公式

package/dist/tools/{explainTool.d.ts → discovery/explainTool.d.ts}

@@ -6,6 +6,6 @@
  * v0.8.1: includeSchema=true 时通过 tokenPeeker 二次确认 schema digest，
  *         检测 registry 与实际 toolDef 之间的 schema drift。
  */
-import type { ToolDef } from "./registry.js";
-import { explainTool as searchExplain, type ExplainToolInput } from "./toolSearch.js";
+import type { ToolDef } from "../registry.js";
+import { explainTool as searchExplain, type ExplainToolInput } from "../catalog/toolSearch.js";
 export declare function explainTool(input: ExplainToolInput, tools: ToolDef[]): ReturnType<typeof searchExplain>;

package/dist/tools/{explainTool.js → discovery/explainTool.js}

@@ -6,8 +6,8 @@
  * v0.8.1: includeSchema=true 时通过 tokenPeeker 二次确认 schema digest，
  *         检测 registry 与实际 toolDef 之间的 schema drift。
  */
-import { buildToolRegistry, computeSchemaDigest } from "./toolRegistry.js";
-import { explainTool as searchExplain } from "./toolSearch.js";
+import { buildToolRegistry, computeSchemaDigest } from "../catalog/toolRegistry.js";
+import { explainTool as searchExplain } from "../catalog/toolSearch.js";
 export function explainTool(input, tools) {
     const registry = buildToolRegistry(tools);
     const toolDefsMap = new Map(tools.map((t) => [t.name, t]));

package/dist/tools/discovery/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./discoverTools.js";
+export * from "./explainTool.js";
+export * from "./invokeDiscoveredTool.js";

package/dist/tools/discovery/index.js

@@ -0,0 +1,3 @@
+export * from "./discoverTools.js";
+export * from "./explainTool.js";
+export * from "./invokeDiscoveredTool.js";

package/dist/tools/{invokeDiscoveredTool.d.ts → discovery/invokeDiscoveredTool.d.ts}

@@ -6,8 +6,8 @@
  * 防递归 → checkInvocation → dispatch → logToolInvocation，
  * 任一环节失败都记审计日志并返回错误结果，不向上层抛错。
  */
-import type { ToolProfile } from "./toolCatalog.js";
-import type { ToolDef } from "./registry.js";
+import type { ToolProfile } from "../catalog/toolCatalog.js";
+import type { ToolDef } from "../registry.js";
 export interface InvokeDiscoveredToolInput {
     toolName: string;
     arguments: Record<string, unknown>;

package/dist/tools/{invokeDiscoveredTool.js → discovery/invokeDiscoveredTool.js}

@@ -6,11 +6,11 @@
  * 防递归 → checkInvocation → dispatch → logToolInvocation，
  * 任一环节失败都记审计日志并返回错误结果，不向上层抛错。
  */
-import { consumeToken } from "../security/discoveryTokenStore.js";
-import { checkInvocation } from "../security/toolInvocationGuard.js";
-import { logToolInvocation, computeArgumentsDigest } from "../logging.js";
-import { buildToolRegistry } from "./toolRegistry.js";
-import { PatchWardenError } from "../errors.js";
+import { consumeToken } from "../../security/discoveryTokenStore.js";
+import { checkInvocation } from "../../security/toolInvocationGuard.js";
+import { logToolInvocation, computeArgumentsDigest } from "../../logging.js";
+import { buildToolRegistry } from "../catalog/toolRegistry.js";
+import { PatchWardenError } from "../../errors.js";
 // ── 内部错误码常量 ────────────────────────────────────────────────
 const RECURSIVE_INVOCATION_BLOCKED = "recursive_invocation_blocked";
 const TOOL_NOT_REGISTERED = "tool_not_registered";

package/dist/tools/dispatch/coreDispatch.js

@@ -4,38 +4,39 @@
  * Each handler directly calls the existing tool function — no logic is
  * rewritten. Extracted from the original handleToolCallInternal switch.
  */
-import { savePlan } from "../savePlan.js";
-import { getPlan } from "../getPlan.js";
-import { createTask } from "../createTask.js";
-import { getTaskStatus } from "../getTaskStatus.js";
-import { getResult, getResultJson, getDiff, getTestLog, getTaskLogTail } from "../taskOutputs.js";
-import { listWorkspace } from "../listWorkspace.js";
-import { readWorkspaceFile } from "../readWorkspaceFile.js";
-import { listTasks } from "../listTasks.js";
-import { cancelTask } from "../cancelTask.js";
-import { killTask } from "../killTask.js";
-import { retryTask } from "../retryTask.js";
-import { getTaskStdoutTail } from "../getTaskStdoutTail.js";
-import { getTaskProgress } from "../getTaskProgress.js";
-import { listAgents } from "../listAgents.js";
-import { healthCheck } from "../healthCheck.js";
-import { getTaskSummary } from "../getTaskSummary.js";
-import { waitForTask } from "../waitForTask.js";
-import { runTaskLoop } from "../runTaskLoop.js";
-import { getTaskLineage } from "../taskLineage.js";
-import { exportTaskEvidencePack } from "../evidencePack.js";
-import { recommendAgentForTask } from "../recommendAgentForTask.js";
-import { auditTask } from "../auditTask.js";
-import { safeStatus } from "../safeStatus.js";
-import { safeAudit, safeDiffSummary, safeResult, safeTestSummary } from "../safeViews.js";
-import { diagnoseTask } from "../diagnoseTask.js";
-import { reconcileTasks } from "../reconcileTasks.js";
-import { checkReleaseGate } from "../checkReleaseGate.js";
-import { getProjectPolicyTool } from "../releaseMode.js";
+import { savePlan } from "../goals/savePlan.js";
+import { getPlan } from "../goals/getPlan.js";
+import { createTask } from "../tasks/createTask.js";
+import { getTaskStatus } from "../tasks/getTaskStatus.js";
+import { getResult, getResultJson, getDiff, getTestLog, getTaskLogTail } from "../tasks/taskOutputs.js";
+import { listWorkspace } from "../workspace/listWorkspace.js";
+import { readWorkspaceFile } from "../workspace/readWorkspaceFile.js";
+import { listTasks } from "../tasks/listTasks.js";
+import { cancelTask } from "../tasks/cancelTask.js";
+import { killTask } from "../tasks/killTask.js";
+import { retryTask } from "../tasks/retryTask.js";
+import { getTaskStdoutTail } from "../tasks/getTaskStdoutTail.js";
+import { getTaskProgress } from "../tasks/getTaskProgress.js";
+import { listAgents } from "../workspace/listAgents.js";
+import { healthCheck } from "../diagnostics/healthCheck.js";
+import { getTaskSummary } from "../tasks/getTaskSummary.js";
+import { waitForTask } from "../tasks/waitForTask.js";
+import { runTaskLoop } from "../tasks/runTaskLoop.js";
+import { getTaskLineage } from "../tasks/taskLineage.js";
+import { exportTaskEvidencePack } from "../tasks/evidencePack.js";
+import { recommendAgentForTask } from "../workspace/recommendAgentForTask.js";
+import { auditTask } from "../diagnostics/auditTask.js";
+import { safeStatus } from "../diagnostics/safeStatus.js";
+import { safeAudit, safeDiffSummary, safeResult, safeTestSummary } from "../diagnostics/safeViews.js";
+import { diagnoseTask } from "../tasks/diagnoseTask.js";
+import { reconcileTasks } from "../tasks/reconcileTasks.js";
+import { checkReleaseGate } from "../release/checkReleaseGate.js";
+import { getProjectPolicyTool } from "../release/releaseMode.js";
 import { runTask } from "../../runner/runTask.js";
 import { getConfig } from "../../config.js";
 import { getToolCatalogSnapshot } from "../registry.js";
 import { toResult } from "./types.js";
+import { parseOptionalTaskTemplate, parseReleaseStage, parseTaskLogFile, } from "./validation.js";
 // ── Local helpers (moved verbatim from registry.ts) ───────────────
 function normalizeWaitSeconds(args) {
     const legacy = args?.wait_seconds;
@@ -71,7 +72,7 @@ export const coreHandlers = {
             plan_id: args?.plan_id ? String(args.plan_id) : undefined,
             inline_plan: args?.inline_plan ? String(args.inline_plan) : undefined,
             plan_title: args?.plan_title ? String(args.plan_title) : undefined,
-            template: args?.template ? String(args.template) : undefined,
+            template: parseOptionalTaskTemplate(args?.template),
             goal: args?.goal ? String(args.goal) : undefined,
             source_task_id: args?.source_task_id ? String(args.source_task_id) : undefined,
             agent: String(args?.agent ?? ""),
@@ -201,7 +202,7 @@ export const coreHandlers = {
         return toResult(getTaskStdoutTail(String(args?.task_id ?? ""), args?.lines ? Number(args.lines) : undefined));
     },
     get_task_log_tail: async (args) => {
-        return toResult(getTaskLogTail(String(args?.task_id ?? ""), args?.file || "stdout", {
+        return toResult(getTaskLogTail(String(args?.task_id ?? ""), parseTaskLogFile(args?.file), {
             lines: args?.lines ? Number(args.lines) : undefined,
             redact: args?.redact !== undefined ? Boolean(args.redact) : undefined,
         }));
@@ -261,7 +262,7 @@ export const coreHandlers = {
     check_release_gate: async (args) => {
         return toResult(await checkReleaseGate({
             repo_path: String(args?.repo_path ?? ""),
-            target_stage: String(args?.target_stage ?? "local_ready"),
+            target_stage: parseReleaseStage(args?.target_stage),
             package_name: args?.package_name ? String(args.package_name) : undefined,
             version: args?.version ? String(args.version) : undefined,
             github_repo: args?.github_repo ? String(args.github_repo) : undefined,

package/dist/tools/dispatch/diagnosticDispatch.d.ts

@@ -5,10 +5,8 @@
  * invoke_discovered_tool consumes a discovery token and dispatches to
  * the target tool via handleToolCall.
  *
- * Note: This module imports getToolDefs and handleToolCall from
- * registry.ts. The import is a live ESM binding resolved at runtime,
- * so the circular dependency (registry → diagnosticDispatch → registry)
- * is safe: neither binding is touched during module evaluation.
+ * The registry injects the audited dispatcher used by invoke_discovered_tool,
+ * avoiding a registry -> diagnosticDispatch -> registry import cycle.
  */
 import type { ToolHandlerMap } from "./types.js";
-export declare const diagnosticHandlers: ToolHandlerMap;
+export declare function buildDiagnosticHandlers(dispatchTool: (name: string, args: Record<string, unknown> | undefined) => Promise<unknown>): ToolHandlerMap;

package/dist/tools/dispatch/diagnosticDispatch.js

@@ -5,74 +5,76 @@
  * invoke_discovered_tool consumes a discovery token and dispatches to
  * the target tool via handleToolCall.
  *
- * Note: This module imports getToolDefs and handleToolCall from
- * registry.ts. The import is a live ESM binding resolved at runtime,
- * so the circular dependency (registry → diagnosticDispatch → registry)
- * is safe: neither binding is touched during module evaluation.
+ * The registry injects the audited dispatcher used by invoke_discovered_tool,
+ * avoiding a registry -> diagnosticDispatch -> registry import cycle.
  */
-import { discoverTools } from "../discoverTools.js";
-import { explainTool } from "../explainTool.js";
-import { invokeDiscoveredTool } from "../invokeDiscoveredTool.js";
+import { discoverTools } from "../discovery/discoverTools.js";
+import { explainTool } from "../discovery/explainTool.js";
+import { invokeDiscoveredTool } from "../discovery/invokeDiscoveredTool.js";
 import { getConfig } from "../../config.js";
-import { resolveToolProfile } from "../toolCatalog.js";
-import { getToolDefs, handleToolCall } from "../registry.js";
+import { resolveToolProfile } from "../catalog/toolCatalog.js";
+import { getToolDefs } from "../definitions/toolDefs.js";
 import { toResult } from "./types.js";
-export const diagnosticHandlers = {
-    discover_tools: async (args) => {
-        const profile = args?.profile === "full" ||
-            args?.profile === "chatgpt_core" ||
-            args?.profile === "chatgpt_direct" ||
-            args?.profile === "chatgpt_search"
-            ? args.profile
-            : undefined;
-        const mode = args?.mode === "delegate" ||
-            args?.mode === "direct" ||
-            args?.mode === "audit" ||
-            args?.mode === "release" ||
-            args?.mode === "diagnostic"
-            ? args.mode
-            : undefined;
-        const riskCeiling = [
-            "readonly",
-            "workspace_read_sensitive",
-            "workspace_write",
-            "command",
-            "release",
-            "credential_sensitive",
-        ].includes(String(args?.riskCeiling ?? ""))
-            ? String(args?.riskCeiling)
-            : undefined;
-        return toResult(discoverTools({
-            query: String(args?.query ?? ""),
-            profile,
-            mode,
-            maxResults: args?.maxResults !== undefined ? Number(args.maxResults) : undefined,
-            riskCeiling,
-            includeHighRisk: args?.includeHighRisk !== undefined ? Boolean(args.includeHighRisk) : undefined,
-        }, getToolDefs()));
-    },
-    explain_tool: async (args) => {
-        return toResult(explainTool({
-            name: String(args?.name ?? ""),
-            includeSchema: args?.includeSchema !== undefined ? Boolean(args.includeSchema) : undefined,
-        }, getToolDefs()));
-    },
-    invoke_discovered_tool: async (args) => {
-        const profile = resolveToolProfile(getConfig().toolProfile);
-        const result = await invokeDiscoveredTool({
-            toolName: String(args?.toolName ?? ""),
-            arguments: args?.arguments && typeof args.arguments === "object"
-                ? args.arguments
-                : {},
-            discoveryToken: String(args?.discoveryToken ?? ""),
-            assessmentId: args?.assessmentId ? String(args.assessmentId) : undefined,
-        }, {
-            tools: getToolDefs(),
-            profile,
-            dispatch: async (name, dispatchArgs) => {
-                return handleToolCall(name, dispatchArgs);
-            },
-        });
-        return toResult(result);
-    },
-};
+export function buildDiagnosticHandlers(dispatchTool) {
+    return {
+        discover_tools: async (args) => {
+            const profile = args?.profile === "full" ||
+                args?.profile === "chatgpt_core" ||
+                args?.profile === "chatgpt_direct" ||
+                args?.profile === "chatgpt_search"
+                ? args.profile
+                : undefined;
+            const mode = args?.mode === "delegate" ||
+                args?.mode === "direct" ||
+                args?.mode === "audit" ||
+                args?.mode === "release" ||
+                args?.mode === "diagnostic"
+                ? args.mode
+                : undefined;
+            const riskCeilings = new Set([
+                "readonly",
+                "workspace_read_sensitive",
+                "workspace_write",
+                "command",
+                "release",
+                "credential_sensitive",
+            ]);
+            const requestedRiskCeiling = String(args?.riskCeiling ?? "");
+            const riskCeiling = riskCeilings.has(requestedRiskCeiling)
+                ? requestedRiskCeiling
+                : undefined;
+            return toResult(discoverTools({
+                query: String(args?.query ?? ""),
+                profile,
+                mode,
+                maxResults: args?.maxResults !== undefined ? Number(args.maxResults) : undefined,
+                riskCeiling,
+                includeHighRisk: args?.includeHighRisk !== undefined ? Boolean(args.includeHighRisk) : undefined,
+            }, getToolDefs()));
+        },
+        explain_tool: async (args) => {
+            return toResult(explainTool({
+                name: String(args?.name ?? ""),
+                includeSchema: args?.includeSchema !== undefined ? Boolean(args.includeSchema) : undefined,
+            }, getToolDefs()));
+        },
+        invoke_discovered_tool: async (args) => {
+            const profile = resolveToolProfile(getConfig().toolProfile);
+            const result = await invokeDiscoveredTool({
+                toolName: String(args?.toolName ?? ""),
+                arguments: args?.arguments && typeof args.arguments === "object"
+                    ? args.arguments
+                    : {},
+                discoveryToken: String(args?.discoveryToken ?? ""),
+                assessmentId: args?.assessmentId ? String(args.assessmentId) : undefined,
+            }, {
+                tools: getToolDefs(),
+                profile,
+                dispatch: async (name, dispatchArgs) => {
+                    return dispatchTool(name, dispatchArgs);
+                },
+            });
+            return toResult(result);
+        },
+    };
+}

package/dist/tools/dispatch/directDispatch.js

@@ -6,16 +6,17 @@
  */
 import { getConfig } from "../../config.js";
 import { PatchWardenError } from "../../errors.js";
-import { createDirectSession } from "../createDirectSession.js";
-import { searchWorkspace } from "../searchWorkspace.js";
-import { applyPatch } from "../applyPatch.js";
-import { runVerification } from "../runVerification.js";
-import { runDirectVerificationBundle } from "../runDirectVerificationBundle.js";
-import { finalizeDirectSession } from "../finalizeDirectSession.js";
-import { auditSession } from "../auditSession.js";
-import { syncFile } from "../syncFile.js";
-import { safeAuditDirectSession, safeDirectSummary, safeFinalizeDirectSession, } from "../safeViews.js";
+import { createDirectSession } from "../direct/createDirectSession.js";
+import { searchWorkspace } from "../workspace/searchWorkspace.js";
+import { applyPatch } from "../workspace/applyPatch.js";
+import { runVerification } from "../tasks/runVerification.js";
+import { runDirectVerificationBundle } from "../direct/runDirectVerificationBundle.js";
+import { finalizeDirectSession } from "../direct/finalizeDirectSession.js";
+import { auditSession } from "../diagnostics/auditSession.js";
+import { syncFile } from "../workspace/syncFile.js";
+import { safeAuditDirectSession, safeDirectSummary, safeFinalizeDirectSession, } from "../diagnostics/safeViews.js";
 import { toResult } from "./types.js";
+import { parsePatchOperations } from "./validation.js";
 /** Mirror of guardDirectProfileEnabled from the original registry.ts. */
 function guardDirectProfileEnabled() {
     const config = getConfig();
@@ -50,7 +51,7 @@ export const directHandlers = {
             session_id: String(args?.session_id ?? ""),
             path: String(args?.path ?? ""),
             expected_sha256: String(args?.expected_sha256 ?? ""),
-            operations: Array.isArray(args?.operations) ? args.operations : [],
+            operations: parsePatchOperations(args?.operations),
         }));
     },
     run_verification: async (args) => {

package/dist/tools/dispatch/goalDispatch.js

@@ -10,10 +10,11 @@ import { exportHandoff } from "../../goal/handoffExport.js";
 import { acceptSubgoal, rejectSubgoal, summarizeGoalProgress } from "../../goal/goalProgress.js";
 import { exportGoalReport } from "../../goal/goalReport.js";
 import { importSpecKitTasks, parseSpecKitJson } from "../../goal/specKitImport.js";
-import { createSubgoalTask } from "../goalSubgoalTask.js";
-import { mergeWorktreeTool } from "../mergeWorktree.js";
-import { discardWorktreeTool } from "../discardWorktree.js";
+import { createSubgoalTask } from "../goals/goalSubgoalTask.js";
+import { mergeWorktreeTool } from "../workspace/mergeWorktree.js";
+import { discardWorktreeTool } from "../workspace/discardWorktree.js";
 import { toResult } from "./types.js";
+import { parseOptionalTaskTemplate } from "./validation.js";
 export const goalHandlers = {
     create_goal: async (args) => {
         return toResult(createGoal(String(args?.repo_path ?? ""), String(args?.title ?? ""), String(args?.goal_description ?? "")));
@@ -32,7 +33,7 @@ export const goalHandlers = {
             plan_id: args?.plan_id ? String(args.plan_id) : undefined,
             inline_plan: args?.inline_plan ? String(args.inline_plan) : undefined,
             plan_title: args?.plan_title ? String(args.plan_title) : undefined,
-            template: args?.template ? String(args.template) : undefined,
+            template: parseOptionalTaskTemplate(args?.template),
             goal: args?.goal ? String(args.goal) : undefined,
             agent: args?.agent ? String(args.agent) : undefined,
             repo_path: String(args?.repo_path ?? ""),

package/dist/tools/dispatch/releaseDispatch.js

@@ -4,13 +4,14 @@
  * Wraps releaseCheck, releasePrepare, releaseVerify, and releaseCleanup
  * from releaseMode.ts.
  */
-import { releaseCheck, releasePrepare, releaseVerify, releaseCleanup, } from "../releaseMode.js";
+import { releaseCheck, releasePrepare, releaseVerify, releaseCleanup, } from "../release/releaseMode.js";
 import { toResult } from "./types.js";
+import { parseReleaseStage } from "./validation.js";
 export const releaseHandlers = {
     release_check: async (args) => {
         return toResult(await releaseCheck({
             repo_path: String(args?.repo_path ?? ""),
-            target_stage: String(args?.target_stage ?? "local_ready"),
+            target_stage: parseReleaseStage(args?.target_stage),
             package_name: args?.package_name ? String(args.package_name) : undefined,
             version: args?.version ? String(args.version) : undefined,
             github_repo: args?.github_repo ? String(args.github_repo) : undefined,

package/dist/tools/dispatch/validation.d.ts

@@ -0,0 +1,7 @@
+import type { PatchOperation } from "../../direct/directPatch.js";
+import type { ReleaseStage } from "../../release/releaseGate.js";
+import { type TaskTemplateName } from "../taskTemplates.js";
+export declare function parseOptionalTaskTemplate(value: unknown): TaskTemplateName | undefined;
+export declare function parseReleaseStage(value: unknown): ReleaseStage;
+export declare function parseTaskLogFile(value: unknown): "stdout" | "stderr" | "test" | "verify";
+export declare function parsePatchOperations(value: unknown): PatchOperation[];