patchwarden 1.5.0 → 1.6.1

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

@@ -1,17 +1,19 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
-import { getConfig, getTasksDir } from "../config.js";
+import { getConfig, getTasksDir } from "../../config.js";
 import { auditSession } from "./auditSession.js";
 import { auditTask } from "./auditTask.js";
-import { finalizeDirectSession } from "./finalizeDirectSession.js";
-import { getTaskSummary } from "./getTaskSummary.js";
-import { guardReadPath } from "../security/pathGuard.js";
-import { redactSensitiveValue } from "../security/contentRedaction.js";
-import { readDirectSession } from "../direct/directSessionStore.js";
+import { finalizeDirectSession } from "../direct/finalizeDirectSession.js";
+import { getTaskSummary } from "../tasks/getTaskSummary.js";
+import { guardReadPath } from "../../security/pathGuard.js";
+import { redactSensitiveValue } from "../../security/contentRedaction.js";
+import { readDirectSession } from "../../direct/directSessionStore.js";
+import { ARTIFACT_SCHEMA_VERSION } from "../../version.js";
 export function safeResult(taskId, options = {}) {
     const maxItems = normalizeMaxItems(options.max_items);
     const summary = getTaskSummary(taskId, { view: "compact", max_items: maxItems });
     return redact({
+        schema_version: ARTIFACT_SCHEMA_VERSION,
         task_id: summary.task_id,
         status: summary.status,
         terminal: summary.terminal,
@@ -39,13 +41,17 @@ export function safeTestSummary(taskId) {
     const { taskDir, config } = getTaskDir(taskId);
     const verify = readJson(join(taskDir, "verify.json"), config);
     const summary = getTaskSummary(taskId, { view: "compact", max_items: 8 });
-    const commands = asArray(verify.commands).map((entry) => ({
-        command: String(entry.command || ""),
-        status: String(entry.status || "unknown"),
-        exit_code: entry.exit_code ?? null,
-        duration_ms: Number(entry.duration_ms || 0),
-    }));
+    const commands = asArray(verify.commands).map((entry) => {
+        const command = asRecord(entry);
+        return {
+            command: String(command.command || ""),
+            status: String(command.status || "unknown"),
+            exit_code: command.exit_code ?? null,
+            duration_ms: Number(command.duration_ms || 0),
+        };
+    });
     return redact({
+        schema_version: ARTIFACT_SCHEMA_VERSION,
         task_id: taskId,
         status: String(verify.status || summary.verification_summary.status || "not_available"),
         command_count: commands.length,
@@ -63,6 +69,7 @@ export function safeDiffSummary(taskId, options = {}) {
     const changedFiles = asArray(changes.changed_files);
     const hygiene = asRecord(changes.artifact_hygiene);
     return redact({
+        schema_version: ARTIFACT_SCHEMA_VERSION,
         task_id: taskId,
         changed_files_total: changedFiles.length,
         additions: Number(changes.additions || 0),
@@ -92,9 +99,9 @@ export function safeDirectSummary(sessionId, options = {}) {
     const session = readDirectSession(sessionId);
     return directSessionToSafe(session, maxItems, "summary");
 }
-export function safeFinalizeDirectSession(sessionId, options = {}) {
+export async function safeFinalizeDirectSession(sessionId, options = {}) {
     const maxItems = normalizeMaxItems(options.max_items);
-    const finalized = finalizeDirectSession({ session_id: sessionId });
+    const finalized = await finalizeDirectSession({ session_id: sessionId });
     const session = readDirectSession(sessionId);
     return redact({
         ...directSessionToSafe(session, maxItems, "finalize"),
@@ -128,6 +135,7 @@ function auditToSafe(audit, maxItems) {
         detail: truncate(check.detail, 240),
     }));
     return redact({
+        schema_version: ARTIFACT_SCHEMA_VERSION,
         task_id: audit.task_id,
         verdict: audit.verdict,
         acceptance: {
@@ -239,7 +247,9 @@ function asArray(value) {
     return Array.isArray(value) ? value : [];
 }
 function asRecord(value) {
-    return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+    return value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : {};
 }
 function limitStrings(values, maxItems) {
     return values.slice(0, maxItems).map((value) => truncate(value, 240));

package/dist/tools/{schemaDriftCheck.d.ts → diagnostics/schemaDriftCheck.d.ts}

@@ -6,7 +6,7 @@
  *
  * 本模块只做检测和报告，不做运行时阻断。
  */
-import type { PatchWardenToolMeta } from "./toolRegistry.js";
+import type { PatchWardenToolMeta } from "../catalog/toolRegistry.js";
 export interface SchemaDriftResult {
     /** true 表示无 drift，false 表示有 drift */
     ok: boolean;

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.d.ts → direct/createDirectSession.d.ts}

@@ -11,4 +11,4 @@ export interface CreateDirectSessionOutput {
     expires_at: string;
     next_action: string;
 }
-export declare function createDirectSession(input: CreateDirectSessionInput): CreateDirectSessionOutput;
+export declare function createDirectSession(input: CreateDirectSessionInput): Promise<CreateDirectSessionOutput>;

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

@@ -1,12 +1,12 @@
 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 function createDirectSession(input) {
+export async function createDirectSession(input) {
     const config = getConfig();
     // ── Validate repo_path ───────────────────────────────────────────
     if (!input.repo_path || input.repo_path.trim() === "") {
@@ -33,7 +33,7 @@ export function createDirectSession(input) {
     // ── Runtime self-modification protection ─────────────────────────
     guardRuntimeSelfModification(resolvedRepoPath);
     // ── Capture repo snapshot ────────────────────────────────────────
-    const snapshot = captureRepoSnapshot(resolvedRepoPath);
+    const snapshot = await captureRepoSnapshot(resolvedRepoPath);
     // ── Create session record ────────────────────────────────────────
     const session = createDirectSessionRecord({
         repo_path: input.repo_path,

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;
 }
@@ -16,4 +16,4 @@ export interface FinalizeDirectSessionOutput {
     finalized: boolean;
     next_action: string;
 }
-export declare function finalizeDirectSession(input: FinalizeDirectSessionInput): FinalizeDirectSessionOutput;
+export declare function finalizeDirectSession(input: FinalizeDirectSessionInput): Promise<FinalizeDirectSessionOutput>;

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.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Dispatch handlers for core task-management tools.
+ *
+ * Each handler directly calls the existing tool function — no logic is
+ * rewritten. Extracted from the original handleToolCallInternal switch.
+ */
+import type { ToolHandlerMap } from "./types.js";
+export declare const coreHandlers: ToolHandlerMap;
+export declare const runTaskHandler: ToolHandlerMap["run_task"];