hunter-harness 0.2.7 → 0.2.9

package/dist/bin.js

@@ -4,6 +4,7 @@
 import { realpathSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 import { createInterface } from "node:readline/promises";
+import { Writable } from "node:stream";
 import { Command, CommanderError } from "commander";
 
 // ../contracts/dist/ai-config.js
@@ -882,6 +883,8 @@ var semanticDocumentKindSchema = z12.enum([
 var semanticEdgeKindSchema = z12.enum([
   "references_path",
   "supersedes",
+  "conflicts_with",
+  "shared_scope",
   "related_archive",
   "tag_cooccurrence"
 ]);
@@ -3379,6 +3382,17 @@ async function ensureCredentialsGitignore(projectRoot) {
     }
   }
   const existing = new Set(content.split("\n").map((line) => line.trim()));
+  const harnessDirectoryIgnored = [
+    ".harness",
+    ".harness/",
+    "/.harness",
+    "/.harness/",
+    ".harness/**",
+    "/.harness/**"
+  ].some((line) => existing.has(line));
+  if (harnessDirectoryIgnored) {
+    return;
+  }
   const missing = CREDENTIALS_GITIGNORE_LINES.filter((line) => !existing.has(line));
   if (missing.length === 0) {
     return;
@@ -3392,11 +3406,21 @@ function resolvePushAuth(input) {
   const localToken = input.local?.token?.trim();
   const token = envToken && envToken.length > 0 ? envToken : localToken && localToken.length > 0 ? localToken : void 0;
   const serverUrl = input.serverUrlFlag ?? input.local?.server_url ?? input.projectUrl ?? void 0;
+  const missing = [];
   if (serverUrl === void 0 || serverUrl === null || serverUrl.trim() === "") {
-    return { code: "SERVER_URL_REQUIRED" };
+    missing.push("url");
   }
   if (token === void 0) {
-    return { code: "TOKEN_INVALID" };
+    missing.push("token");
+  }
+  if (missing.length > 0) {
+    return {
+      code: missing.includes("url") ? "SERVER_URL_REQUIRED" : "TOKEN_INVALID",
+      missing
+    };
+  }
+  if (serverUrl === void 0 || token === void 0) {
+    throw new Error("push auth resolution invariant failed");
   }
   return { serverUrl, token };
 }
@@ -3734,9 +3758,6 @@ async function pushProject(options) {
   if (options.dryRun) {
     return { preview, proposalId: null, projectId: project.project.project_id };
   }
-  if (options.confirmProposal !== void 0 && !await options.confirmProposal(preview)) {
-    return { preview, proposalId: null, projectId: project.project.project_id, cancelled: true };
-  }
   const localCredentials = await readLocalCredentials(root);
   const auth = resolvePushAuth({
     ...options.serverUrl === void 0 ? {} : { serverUrlFlag: options.serverUrl },
@@ -3748,10 +3769,10 @@ async function pushProject(options) {
   });
   if ("code" in auth) {
     if (auth.code === "SERVER_URL_REQUIRED") {
-      throw new PushWorkflowError("server_url is required; use --server-url, project.yaml server.url, or " + CREDENTIALS_HINT, 3, "SERVER_URL_REQUIRED");
+      throw new PushWorkflowError("server_url is required; use --server-url, project.yaml server.url, or " + CREDENTIALS_HINT, 3, "SERVER_URL_REQUIRED", { missing_credentials: auth.missing });
     }
     const tokenEnv2 = options.tokenEnv ?? project.server.token_env;
-    throw new PushWorkflowError("API token is unset; set " + tokenEnv2 + " or " + CREDENTIALS_HINT, 8, "TOKEN_INVALID");
+    throw new PushWorkflowError("API token is unset; set " + tokenEnv2 + " or " + CREDENTIALS_HINT, 8, "TOKEN_INVALID", { missing_credentials: auth.missing });
   }
   const serverUrl = auth.serverUrl;
   const token = auth.token;
@@ -3768,6 +3789,9 @@ async function pushProject(options) {
   if (parsedServerUrl.protocol !== "https:") {
     throw new PushWorkflowError("server_url must use HTTPS", 3, "SERVER_URL_INVALID");
   }
+  if (options.confirmProposal !== void 0 && !await options.confirmProposal(preview)) {
+    return { preview, proposalId: null, projectId: project.project.project_id, cancelled: true };
+  }
   const workflowPath = join10(root, ".harness", "state", "local", "push-workflow.json");
   const priorWorkflow = await readOptionalJson(workflowPath);
   const provisionalRequestId = priorWorkflow?.local_project_key === project.project.local_project_key ? priorWorkflow.request_id : uuidV7();
@@ -5089,7 +5113,9 @@ function errorPayload(error) {
 }
 async function promptForCredentials(dependencies, missing) {
   const serverUrl = missing === "token" ? void 0 : (await dependencies.prompt("\u670D\u52A1\u7AEF URL (https://...): ")).trim();
-  const token = missing === "url" ? void 0 : (await dependencies.prompt("API Token: ")).trim();
+  const token = missing === "url" ? void 0 : (await (dependencies.promptSecret ?? dependencies.prompt)(
+    "API Token\uFF08\u8F93\u5165\u5C06\u9690\u85CF\uFF09: "
+  )).trim();
   if ((missing === "url" || missing === "both") && (serverUrl === void 0 || serverUrl === "")) {
     return null;
   }
@@ -5198,7 +5224,8 @@ async function runPush(options, dependencies) {
       return 0;
     } catch (error) {
       if (attempt === 0 && options.nonInteractive !== true && options.dryRun !== true && error instanceof PushWorkflowError && (error.code === "SERVER_URL_REQUIRED" || error.code === "TOKEN_INVALID")) {
-        const missing = error.code === "SERVER_URL_REQUIRED" ? "url" : error.code === "TOKEN_INVALID" ? "token" : "both";
+        const missingCredentials = error.details?.missing_credentials;
+        const missing = missingCredentials?.includes("url") === true && missingCredentials.includes("token") ? "both" : missingCredentials?.includes("url") === true || error.code === "SERVER_URL_REQUIRED" ? "url" : "token";
         dependencies.stderr(
           error.message + "\n\u53EF\u5728\u4E0B\u65B9\u5F55\u5165\u5E76\u5199\u5165 .harness/credentials.local.yaml\u3002\n"
         );
@@ -5668,6 +5695,33 @@ async function readWorkflowFamilyManifest(resourcesRoot) {
 }
 
 // src/bin.ts
+async function promptSecret(question, input = process.stdin, output = process.stdout) {
+  if (input.isTTY !== true || output.isTTY !== true) {
+    const terminal2 = createInterface({ input, output });
+    try {
+      return await terminal2.question(question);
+    } finally {
+      terminal2.close();
+    }
+  }
+  output.write(question);
+  const mutedOutput = new Writable({
+    write(_chunk, _encoding, callback) {
+      callback();
+    }
+  });
+  const terminal = createInterface({
+    input,
+    output: mutedOutput,
+    terminal: true
+  });
+  try {
+    return await terminal.question("");
+  } finally {
+    terminal.close();
+    output.write("\n");
+  }
+}
 function defaultDependencies(overrides) {
   return {
     cwd: overrides.cwd ?? process.cwd(),
@@ -5682,6 +5736,7 @@ function defaultDependencies(overrides) {
         terminal.close();
       }
     }),
+    promptSecret: overrides.promptSecret ?? overrides.prompt ?? promptSecret,
     fetch: overrides.fetch ?? globalThis.fetch,
     env: overrides.env ?? process.env
   };
@@ -5765,5 +5820,6 @@ if (isDirectCliEntrypoint()) {
 }
 export {
   isDirectCliEntrypoint,
+  promptSecret,
   runCli
 };

package/package.json

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