hunter-harness 0.2.13 → 0.2.14

package/dist/bin.js

@@ -4388,30 +4388,70 @@ function assertPreviewAllowed(preview, skip) {
   }
 }
 var CREDENTIALS_HINT = "\u53EF\u5728\u4EA4\u4E92\u6A21\u5F0F\u4E0B\u5F55\u5165\uFF0C\u6216\u5199\u5165 .harness/credentials.local.yaml\uFF08\u52FF\u63D0\u4EA4 git\uFF09";
-var STALE_BASELINE_MESSAGE = "\u670D\u52A1\u7AEF artifact \u5DF2\u66F4\u65B0\uFF0C\u8BF7\u5148\u6267\u884C npx hunter-harness update\uFF08\u51B2\u7A81\u53EF\u7528 update --resolve <path>=keep-local|accept-remote\uFF09\u518D\u63A8";
+var CONFLICT_PREVIEW_LIMIT = 8;
+function conflictGroup(path) {
+  const knowledgeMatch = path.match(/^\.harness\/knowledge\/entries\/([^/]+)\//);
+  if (knowledgeMatch?.[1] !== void 0) {
+    return `knowledge/${knowledgeMatch[1]}`;
+  }
+  if (path.startsWith(".harness/knowledge/"))
+    return "knowledge/other";
+  if (path === ".harness/context-index.json")
+    return "context-index";
+  return path.split("/", 1)[0] ?? "other";
+}
+function conflictGroups(conflicts) {
+  const groups = {};
+  for (const conflict2 of conflicts) {
+    const group = conflictGroup(conflict2.path);
+    groups[group] = (groups[group] ?? 0) + 1;
+  }
+  return groups;
+}
+function formatStaleBaselineMessage(conflicts = []) {
+  const lines = [
+    "\u670D\u52A1\u7AEF\u5B58\u5728\u672C\u5730\u5C1A\u672A\u786E\u8BA4\u7684\u66F4\u65B0\uFF0Cpush \u5DF2\u6682\u505C\u4EE5\u907F\u514D\u8986\u76D6\u5E76\u884C\u4FEE\u6539\u3002"
+  ];
+  if (conflicts.length > 0) {
+    lines.push(`\u68C0\u6D4B\u5230 ${conflicts.length} \u4E2A\u51B2\u7A81\uFF08\u4EC5\u5C55\u793A\u524D ${CONFLICT_PREVIEW_LIMIT} \u4E2A\uFF09\uFF1A`);
+    for (const conflict2 of conflicts.slice(0, CONFLICT_PREVIEW_LIMIT)) {
+      lines.push(`  - ${conflict2.path}`);
+    }
+    if (conflicts.length > CONFLICT_PREVIEW_LIMIT) {
+      lines.push(`  - \u2026\u53E6 ${conflicts.length - CONFLICT_PREVIEW_LIMIT} \u4E2A`);
+    }
+  }
+  lines.push("\u4FDD\u7559\u672C\u5730\u5E76\u7EE7\u7EED\uFF1Anpx hunter-harness update --conflict-strategy keep-local --yes", "\u63A5\u53D7\u670D\u52A1\u7AEF\u7248\u672C\uFF1Anpx hunter-harness update --conflict-strategy accept-remote --yes", "\u9010\u9879\u5904\u7406\uFF1Anpx hunter-harness update --resolve <path>=keep-local|accept-remote");
+  return lines.join("\n");
+}
 function staleBaselineError(code, conflicts) {
-  const conflictHint = conflicts !== void 0 && conflicts.length > 0 ? " \u51B2\u7A81\u6587\u4EF6\uFF1A" + conflicts.map((item2) => item2.path).join(", ") : "";
-  return new PushWorkflowError(STALE_BASELINE_MESSAGE + conflictHint, 5, code);
+  const conflictList = [...conflicts ?? []];
+  return new PushWorkflowError(formatStaleBaselineMessage(conflictList), 5, code, conflictList.length === 0 ? void 0 : {
+    conflicts: conflictList,
+    conflict_count: conflictList.length,
+    conflict_groups: conflictGroups(conflictList)
+  });
 }
-async function syncToLatest(root, project, baseline, client) {
+async function syncToLatest(root, project, baseline, client, confirmConflictStrategy) {
   const syncResult = await synchronizeArtifacts({
     projectRoot: root,
     project,
     client,
     requestId: uuidV7(),
     dryRun: false,
-    conflictStrategy: "manual"
+    conflictStrategy: "manual",
+    ...confirmConflictStrategy === void 0 ? {} : { confirmConflictStrategy }
   }, baseline);
   if (syncResult.conflicts.length > 0) {
     throw staleBaselineError("PROJECT_VERSION_CONFLICT", syncResult.conflicts);
   }
   return await readBaseline(root);
 }
-async function autoRebaseIfServerAdvanced(root, project, baseline, client, remoteVersion) {
+async function autoRebaseIfServerAdvanced(root, project, baseline, client, remoteVersion, confirmConflictStrategy) {
   if (remoteVersion === baseline.complete_project_version) {
     return baseline;
   }
-  const updated = await syncToLatest(root, project, baseline, client);
+  const updated = await syncToLatest(root, project, baseline, client, confirmConflictStrategy);
   if (remoteVersion !== null && updated.complete_project_version !== remoteVersion) {
     throw staleBaselineError("PROJECT_VERSION_CONFLICT");
   }
@@ -4508,7 +4548,7 @@ async function pushProject(options) {
   const boundAtStart = project.project.project_id;
   if (boundAtStart !== null) {
     const remote = await client.getProject(boundAtStart, uuidV7());
-    baseline = await autoRebaseIfServerAdvanced(root, project, baseline, client, remote.latest_project_version);
+    baseline = await autoRebaseIfServerAdvanced(root, project, baseline, client, remote.latest_project_version, options.confirmConflictStrategy);
     preview = makePreview(baseline, await managedFiles(root, project), options.confirmedProjectLocal ?? [], installedPaths);
   }
   const initialSkip = await resolveSensitiveScanSkip(preview, options);
@@ -4628,7 +4668,7 @@ async function pushProject(options) {
     } catch (error) {
       if (error instanceof ApiError && (error.code === "STALE_PUSH" || error.code === "PROJECT_VERSION_CONFLICT") && !finalizeRetried) {
         finalizeRetried = true;
-        baseline = await syncToLatest(root, project, baseline, client);
+        baseline = await syncToLatest(root, project, baseline, client, options.confirmConflictStrategy);
         workflow = resetSession(workflow, proposalManifestHash);
         await atomicWriteJson(workflowPath, workflow);
         session = await client.createProposalSession(projectId, {
@@ -5799,6 +5839,24 @@ async function runCleanup(options, dependencies) {
 }
 
 // src/commands/push.ts
+var CONFLICT_PREVIEW_LIMIT2 = 8;
+async function promptStaleConflictStrategy(conflicts, dependencies) {
+  const lines = [`\u68C0\u6D4B\u5230 ${conflicts.length} \u4E2A\u670D\u52A1\u7AEF\u5E76\u53D1\u51B2\u7A81\uFF1A`];
+  for (const conflict2 of conflicts.slice(0, CONFLICT_PREVIEW_LIMIT2)) {
+    lines.push(`  - ${conflict2.path}`);
+  }
+  if (conflicts.length > CONFLICT_PREVIEW_LIMIT2) {
+    lines.push(`  - \u2026\u53E6 ${conflicts.length - CONFLICT_PREVIEW_LIMIT2} \u4E2A`);
+  }
+  dependencies.stderr(lines.join("\n") + "\n");
+  const answer = await dependencies.prompt(
+    "\u8BF7\u9009\u62E9\u5904\u7406\u65B9\u5F0F\uFF1A\n  1. \u4FDD\u7559\u672C\u5730\u5185\u5BB9\u5E76\u7EE7\u7EED\u63A8\u9001\uFF08\u63A8\u8350\uFF09\n  2. \u63A5\u53D7\u670D\u52A1\u7AEF\u5185\u5BB9\u5E76\u7EE7\u7EED\u63A8\u9001\n  3. \u9000\u51FA\uFF0C\u7A0D\u540E\u9010\u9879\u5904\u7406\n\u8BF7\u9009\u62E9 [1]\uFF1A"
+  );
+  const selected = answer.trim();
+  if (selected === "" || selected === "1") return "keep-local";
+  if (selected === "2") return "accept-remote";
+  return false;
+}
 function formatFindings(details) {
   if (details?.findings === void 0 || details.findings.length === 0) {
     return "";
@@ -5899,7 +5957,8 @@ async function runPush(options, dependencies) {
           const reasonAnswer = await dependencies.prompt("\u8DF3\u8FC7\u539F\u56E0\uFF08\u53EF\u9009\uFF0C\u56DE\u8F66\u8DF3\u8FC7\uFF09: ");
           const reason = reasonAnswer.trim();
           return reason === "" ? { skip: true } : { skip: true, reason };
-        } }
+        } },
+        ...options.nonInteractive === true ? {} : { confirmConflictStrategy: async (conflicts) => promptStaleConflictStrategy(conflicts, dependencies) }
       });
       if ("cancelled" in result && result.cancelled === true) {
         return 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-harness",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "Local-first, server-governed agent harness",
   "license": "MIT",
   "type": "module",