hunter-harness 0.2.11 → 0.2.12

package/dist/bin.js

@@ -1230,6 +1230,9 @@ var HunterHarnessApiClient = class {
       body
     });
   }
+  async getProject(projectId, requestId) {
+    return this.request("GET", "/api/v1/projects/" + encodeURIComponent(projectId), { requestId });
+  }
   async createProposalSession(projectId, body, requestId, idempotencyKey) {
     return this.request("POST", "/api/v1/projects/" + encodeURIComponent(projectId) + "/proposal-sessions", { requestId, idempotencyKey, body });
   }
@@ -3732,6 +3735,10 @@ 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\u5DF2\u6709\u66F4\u65B0\u7684\u63A8\u9001\uFF0C\u8BF7\u5148 git pull \u540E\u6267\u884C npx hunter-harness update \u518D\u63A8";
+function staleBaselineError(code) {
+  return new PushWorkflowError(STALE_BASELINE_MESSAGE, 5, code);
+}
 function makePreview(baseline, files, confirmedProjectLocal, ignorePaths, deletedAt = (/* @__PURE__ */ new Date()).toISOString()) {
   const filteredFiles = {};
   for (const [path, content] of Object.entries(files)) {
@@ -3776,14 +3783,12 @@ async function pushProject(options) {
   const profile = parseHarnessProfile(project.project.profiles[0]);
   const installedPaths = profile === null ? /* @__PURE__ */ new Set() : new Set(await Promise.all(enabledHarnessAgents(project).map((agent) => managedBundleTargets(options.resourcesRoot, profile, agent))).then((targets) => targets.flatMap((target) => [...target])));
   let preview = makePreview(baseline, await managedFiles(root, project), options.confirmedProjectLocal ?? [], installedPaths);
-  const initialSkip = await resolveSensitiveScanSkip(preview, options);
-  if (initialSkip.cancelled === true) {
-    return { preview, proposalId: null, projectId: project.project.project_id, cancelled: true };
-  }
-  let sensitiveScanSkip = initialSkip.skip;
-  let sensitiveScanSkipReason = initialSkip.reason;
-  assertPreviewAllowed(preview, sensitiveScanSkip);
   if (options.dryRun) {
+    const drySkip = await resolveSensitiveScanSkip(preview, options);
+    if (drySkip.cancelled === true) {
+      return { preview, proposalId: null, projectId: project.project.project_id, cancelled: true };
+    }
+    assertPreviewAllowed(preview, drySkip.skip);
     return { preview, proposalId: null, projectId: project.project.project_id };
   }
   const localCredentials = await readLocalCredentials(root);
@@ -3817,6 +3822,25 @@ async function pushProject(options) {
   if (parsedServerUrl.protocol !== "https:") {
     throw new PushWorkflowError("server_url must use HTTPS", 3, "SERVER_URL_INVALID");
   }
+  const client = new HunterHarnessApiClient({
+    serverUrl: parsedServerUrl.toString(),
+    token,
+    ...options.fetch === void 0 ? {} : { fetch: options.fetch }
+  });
+  const boundAtStart = project.project.project_id;
+  if (boundAtStart !== null) {
+    const remote = await client.getProject(boundAtStart, uuidV7());
+    if (remote.latest_project_version !== baseline.complete_project_version) {
+      throw staleBaselineError("PROJECT_VERSION_CONFLICT");
+    }
+  }
+  const initialSkip = await resolveSensitiveScanSkip(preview, options);
+  if (initialSkip.cancelled === true) {
+    return { preview, proposalId: null, projectId: project.project.project_id, cancelled: true };
+  }
+  let sensitiveScanSkip = initialSkip.skip;
+  let sensitiveScanSkipReason = initialSkip.reason;
+  assertPreviewAllowed(preview, sensitiveScanSkip);
   if (options.confirmProposal !== void 0 && !await options.confirmProposal(preview)) {
     return { preview, proposalId: null, projectId: project.project.project_id, cancelled: true };
   }
@@ -3831,11 +3855,6 @@ async function pushProject(options) {
     await atomicWriteJson(workflowPath, workflow);
     preview = makePreview(baseline, await managedFiles(root, project), options.confirmedProjectLocal ?? [], installedPaths, workflow.created_at);
     const requestId = workflow.request_id;
-    const client = new HunterHarnessApiClient({
-      serverUrl: parsedServerUrl.toString(),
-      token,
-      ...options.fetch === void 0 ? {} : { fetch: options.fetch }
-    });
     if (project.project.project_id === null) {
       const resolved = await client.resolveProject({
         schema_version: 1,
@@ -3942,8 +3961,8 @@ async function pushProject(options) {
       throw error;
     }
     if (error instanceof ApiError) {
-      if (error.code === "STALE_PUSH") {
-        throw new PushWorkflowError("\u670D\u52A1\u7AEF\u5DF2\u6709\u66F4\u65B0\u7684\u63A8\u9001\uFF0C\u8BF7\u5148 git pull \u540E\u6267\u884C npx hunter-harness update \u518D\u63A8", 5, "STALE_PUSH");
+      if (error.code === "STALE_PUSH" || error.code === "PROJECT_VERSION_CONFLICT") {
+        throw staleBaselineError(error.code);
       }
       if (error.code === "SENSITIVE_CONTENT_BLOCKED") {
         const details = error.details;
@@ -4314,17 +4333,20 @@ async function updateProject(options) {
   if (project.project.project_id === null) {
     throw new UpdateWorkflowError("project is not bound to a server", 3, "PROJECT_NOT_BOUND");
   }
-  const serverUrl = options.serverUrl ?? project.server.url;
   const tokenEnv = options.tokenEnv ?? project.server.token_env;
-  if (serverUrl === null || serverUrl === void 0) {
-    throw new UpdateWorkflowError("server_url is required", 3, "SERVER_URL_REQUIRED");
-  }
   if (!/^[A-Z_][A-Z0-9_]*$/.test(tokenEnv)) {
     throw new UpdateWorkflowError("token_env is invalid", 3, "TOKEN_ENV_INVALID");
   }
-  const token = options.env[tokenEnv];
-  if (token === void 0 || token.trim() === "") {
-    throw new UpdateWorkflowError("API token environment variable is unset", 8, "TOKEN_INVALID");
+  const local = await readLocalCredentials(root);
+  const serverUrl = options.serverUrl ?? local?.server_url ?? project.server.url;
+  if (serverUrl === null || serverUrl === void 0) {
+    throw new UpdateWorkflowError("server_url is required", 3, "SERVER_URL_REQUIRED");
+  }
+  const envToken = options.env[tokenEnv]?.trim();
+  const localToken = local?.token?.trim();
+  const token = envToken !== void 0 && envToken !== "" ? envToken : localToken !== void 0 && localToken !== "" ? localToken : void 0;
+  if (token === void 0) {
+    throw new UpdateWorkflowError(`API token \u672A\u914D\u7F6E\uFF1A\u8BF7\u8BBE\u7F6E\u73AF\u5883\u53D8\u91CF ${tokenEnv}\uFF0C\u6216\u5728 .harness/credentials.local.yaml \u914D\u7F6E token\uFF08\u53EF\u901A\u8FC7 npx hunter-harness push \u5F15\u5BFC\u5199\u5165\uFF09`, 8, "TOKEN_INVALID");
   }
   const requestId = uuidV7();
   const baseline = await readBaseline(root);
@@ -4569,13 +4591,15 @@ function normalizeProfile(value) {
   if (value === "2" || value === "java") return "java";
   throw new InitConfigurationError("\u914D\u7F6E\u7C7B\u578B\u5FC5\u987B\u4E3A general \u6216 java");
 }
+var ALL_AGENT_TOKENS = /* @__PURE__ */ new Set(["all", "5"]);
 function parseAgentsInput(raw) {
   const trimmed = raw.trim();
   if (trimmed === "") return ["claude-code"];
-  if (trimmed === "all") return [...HARNESS_AGENT_ORDER];
+  if (ALL_AGENT_TOKENS.has(trimmed)) return [...HARNESS_AGENT_ORDER];
   const agents = [];
   for (const token of trimmed.split(",")) {
     const value = token.trim();
+    if (ALL_AGENT_TOKENS.has(value)) return [...HARNESS_AGENT_ORDER];
     const byIndex = AGENT_BY_INDEX[value];
     if (byIndex !== void 0) {
       agents.push(byIndex);
@@ -5018,6 +5042,14 @@ var AGENT_LABELS = {
   cursor: "Cursor",
   codebuddy: "CodeBuddy"
 };
+function agentMenuLines(installedProfiles) {
+  const lines = HARNESS_AGENT_ORDER.map((agent, index) => {
+    const profile = installedProfiles?.[agent];
+    const suffix = profile === void 0 ? "" : `\uFF08\u5DF2\u5B89\u88C5\uFF1A${profile}\uFF09`;
+    return `  ${index + 1}. ${AGENT_LABELS[agent]}${suffix}`;
+  }).join("\n");
+  return lines + "\n  5. \u5168\u90E8";
+}
 async function configureCodeBuddyExtras(agents, surface, options, dependencies) {
   if (!agents.includes("codebuddy")) return;
   const plan = await inspectCodeBuddySetup(dependencies.cwd);
@@ -5067,7 +5099,7 @@ async function runFirstInstall(options, dependencies) {
       options,
       options.nonInteractive === true ? {} : {
         agents: () => dependencies.prompt(
-          "\u8BF7\u9009\u62E9\u76EE\u6807 Agent\uFF08\u53EF\u591A\u9009\uFF0C\u4F7F\u7528\u9017\u53F7\u5206\u9694\uFF09\n  1. Claude Code\n  2. Codex\n  3. Cursor\n  4. CodeBuddy\n\u8BF7\u8F93\u5165\u7F16\u53F7 [1]: "
+          "\u8BF7\u9009\u62E9\u76EE\u6807 Agent\uFF08\u53EF\u591A\u9009\uFF0C\u4F7F\u7528\u9017\u53F7\u5206\u9694\uFF09\n" + agentMenuLines() + "\n\u8BF7\u8F93\u5165\u7F16\u53F7 [1]: "
         ).then((answer) => answer.trim()),
         profile: () => dependencies.prompt(
           "\u8BF7\u9009\u62E9 Harness \u7C7B\u578B\uFF1A\n1. \u901A\u7528\uFF08\u9ED8\u8BA4\uFF09\n2. Java\n\u8BF7\u8F93\u5165 1 \u6216 2 [1]: "
@@ -5165,10 +5197,7 @@ async function runExistingProject(options, dependencies, currentProfile, current
       `Hunter Harness \u5F53\u524D\u914D\u7F6E\uFF1A
 ${currentLines}
 \u8BF7\u9009\u62E9\u672C\u6B21\u8981\u65B0\u589E\u6216\u5237\u65B0\u7684\u5DE5\u5177\uFF08\u53EF\u591A\u9009\uFF0C\u9017\u53F7\u5206\u9694\uFF1B\u672A\u9009\u62E9\u7684\u5DE5\u5177\u4FDD\u6301\u4E0D\u53D8\uFF09\uFF1A
-  1. Claude Code
-  2. Codex
-  3. Cursor
-  4. CodeBuddy
+` + agentMenuLines(installed.profiles) + `
 \u8BF7\u8F93\u5165\u7F16\u53F7 [${defaultSelection}]\uFF0C\u6216\u8F93\u5165 0 \u53D6\u6D88\uFF1A`
     );
     if (answer.trim() === "0" || /^c/i.test(answer.trim())) return 2;

package/package.json

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