svharness 0.15.13 → 0.15.14

package/dist/commands/auto-pack-req.js

@@ -36,6 +36,7 @@ async function runAutoPackReq(positionalWorkdir, opts, cmd) {
     const workCtx = await (0, auto_pack_req_context_1.resolveAutoPackReqWorkContext)(positionalWorkdir, merged.workDir, merged.requirements);
     const runOpts = {
         ...merged,
+        harnessName: merged.harnessName ?? auto_pack_req_context_1.PACK_REQ_HARNESS_NAME,
         ...(workCtx.requirementsPath ? { requirements: workCtx.requirementsPath } : {}),
     };
     if (workCtx.harnessRoot) {
@@ -44,10 +45,10 @@ async function runAutoPackReq(positionalWorkdir, opts, cmd) {
     }
     else if (workCtx.mode === 'requirements-cwd') {
         logger_1.logger.info(`[auto_pack_req] 当前目录识别为 requirements 输入：${workCtx.requirementsPath}`);
-        logger_1.logger.info(`[auto_pack_req] 将在上级目录创建 harness：${workCtx.workDir}`);
+        logger_1.logger.info(`[auto_pack_req] 将在当前目录创建固定 harness：${node_path_1.default.join(workCtx.workDir, auto_pack_req_context_1.PACK_REQ_HARNESS_DIR)}（等价 --requirements .）`);
     }
     else {
-        logger_1.logger.info('[auto_pack_req] 资料包模式：将创建 harness 并执行 S30+S40');
+        logger_1.logger.info(`[auto_pack_req] 资料包模式：将创建 ${auto_pack_req_context_1.PACK_REQ_HARNESS_DIR} 并执行 S30+S40`);
     }
     await (0, auto_1.runAuto)(workCtx.workDir, runOpts, cmd);
 }

package/dist/commands/auto.js

@@ -10,6 +10,7 @@ const node_child_process_1 = require("node:child_process");
 const config_1 = require("../config");
 const logger_1 = require("../utils/logger");
 const harness_resolver_1 = require("../lib/harness-resolver");
+const auto_pack_req_context_1 = require("../lib/auto-pack-req-context");
 const auto_orchestrator_1 = require("../lib/auto-orchestrator");
 const dashboard_1 = require("../dashboard");
 const acp_agent_cli_resolver_1 = require("../lib/acp-agent-cli-resolver");
@@ -70,7 +71,7 @@ async function runAuto(positionalWorkdir, opts, cmd) {
 }
 async function resolveAutoContext(positionalWorkdir, opts) {
     const workDir = node_path_1.default.resolve(positionalWorkdir ?? opts.workDir ?? process.cwd());
-    const harnessRoot = await (0, harness_resolver_1.resolveHarnessRoot)(workDir);
+    const harnessRoot = await resolveHarnessForAuto(workDir, normalizeScope(opts.scope));
     const acpAgentCli = opts.dryRun ? null : (0, acp_agent_cli_resolver_1.ensureAcpAgentCliAvailable)();
     return {
         workDir,
@@ -122,3 +123,11 @@ function normalizeBaselineExtract(value) {
 function normalizeScope(value) {
     return value === 'requirements' ? 'requirements' : 'full';
 }
+async function resolveHarnessForAuto(workDir, scope) {
+    if (scope === 'requirements') {
+        if (await (0, harness_resolver_1.isHarnessRoot)(workDir))
+            return workDir;
+        return (0, auto_pack_req_context_1.resolvePackReqHarnessRoot)(workDir);
+    }
+    return (0, harness_resolver_1.resolveHarnessRoot)(workDir);
+}

package/dist/core/doc-intake-paths.js

@@ -20,7 +20,12 @@ exports.RAW_SKIP_DIR_NAMES = new Set([
     'dist',
 ]);
 function shouldSkipRawSubdir(name) {
-    return exports.RAW_SKIP_DIR_NAMES.has(name);
+    if (exports.RAW_SKIP_DIR_NAMES.has(name))
+        return true;
+    // auto_pack_req：`--requirements .` 时勿把同级的 `.requirements-harness/` 当作源资料。
+    if (name.endsWith('-harness'))
+        return true;
+    return false;
 }
 /**
  * Recursively list source files for seed intake, skipping harness artifact dirs.

package/dist/lib/auto-materials-prep.js

@@ -12,6 +12,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const init_1 = require("../commands/init");
 const harness_name_1 = require("../utils/harness-name");
+const doc_intake_paths_1 = require("../core/doc-intake-paths");
 const logger_1 = require("../utils/logger");
 async function runMaterialsPrepAndBuild(ctx) {
     const detected = await detectInputs(ctx.workDir, ctx.buildOverrides);
@@ -60,6 +61,8 @@ async function detectInputs(workDir, overrides) {
     for (const entry of entries) {
         if (!entry.isDirectory())
             continue;
+        if ((0, doc_intake_paths_1.shouldSkipRawSubdir)(entry.name))
+            continue;
         const abs = node_path_1.default.join(workDir, entry.name);
         const lower = entry.name.toLowerCase();
         const files = await listFiles(abs, 3);
@@ -239,10 +242,15 @@ function deriveHarnessName(goal, workDir, log) {
 }
 /** Strip non-ASCII, collapse internal hyphens, trim leading/trailing hyphens. */
 function sanitizeToAscii(raw) {
-    return raw
+    const ascii = raw
         .toLowerCase()
         .replace(/[^a-z0-9]+/g, '-')
         .replace(/^-+|-+$/g, '');
+    // Goal 模板常含「构建 harness」，与 workDir 叠在一起会得到 `xxx-harness` 短名。
+    const core = (0, harness_name_1.stripHarnessSuffixFromCore)(ascii);
+    if (!core || core === 'harness')
+        return '';
+    return core;
 }
 function detectArchFromDetected(detected) {
     const baseline = detected.baseline?.path;

package/dist/lib/auto-pack-req-context.js

@@ -3,12 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PACK_REQ_HARNESS_DIR = exports.PACK_REQ_HARNESS_NAME = void 0;
 exports.looksLikeMaterialsPackRoot = looksLikeMaterialsPackRoot;
 exports.looksLikeRequirementsFolder = looksLikeRequirementsFolder;
+exports.resolvePackReqHarnessRoot = resolvePackReqHarnessRoot;
 exports.resolveAutoPackReqWorkContext = resolveAutoPackReqWorkContext;
 const node_path_1 = __importDefault(require("node:path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const harness_resolver_1 = require("./harness-resolver");
+/** auto_pack_req 固定短名 → 目录 `.requirements-harness/` */
+exports.PACK_REQ_HARNESS_NAME = '.requirements';
+exports.PACK_REQ_HARNESS_DIR = '.requirements-harness';
 const DOC_FILE_RE = /\.(md|docx|doc|pdf|xlsx|xls|pptx|ppt|txt|csv)$/i;
 const MATERIALS_PACK_SUBDIR_RE = /^(requirements?|baseline|references?|extra[-_]?skills?|需求|接口|协议|skill)/i;
 /** 当前目录是否像资料包根（含 requirements/、baseline/ 等子目录） */
@@ -46,15 +51,33 @@ async function looksLikeRequirementsFolder(dir) {
     }
     return false;
 }
+/** 仅识别 workDir 下固定的 `.requirements-harness/`，不扫描其它 `*-harness/`。 */
+async function resolvePackReqHarnessRoot(workDir) {
+    const candidate = node_path_1.default.join(node_path_1.default.resolve(workDir), exports.PACK_REQ_HARNESS_DIR);
+    return (await (0, harness_resolver_1.isHarnessRoot)(candidate)) ? candidate : null;
+}
 /**
  * 解析 auto_pack_req 工作上下文。
- * 无显式 workdir 时：若当前目录本身是 requirements 资料夹，则以其父目录为 workDir 并固定 requirements 输入。
+ * 无显式 workdir 时：若当前目录本身是 requirements 资料夹，则 workDir 保持为当前目录，
+ * requirements 输入等价于 `--requirements .`，harness 固定为 `./.requirements-harness/`。
  */
 async function resolveAutoPackReqWorkContext(positionalWorkdir, configWorkDir, requirementsOverride) {
     const explicit = positionalWorkdir ?? configWorkDir;
     if (explicit) {
         const workDir = node_path_1.default.resolve(explicit);
-        const harnessRoot = await (0, harness_resolver_1.resolveHarnessRoot)(workDir);
+        if (await (0, harness_resolver_1.isHarnessRoot)(workDir)) {
+            return {
+                workDir,
+                harnessRoot: workDir,
+                requirementsPath: requirementsOverride
+                    ? node_path_1.default.isAbsolute(requirementsOverride)
+                        ? requirementsOverride
+                        : node_path_1.default.resolve(workDir, requirementsOverride)
+                    : undefined,
+                mode: 'harness-rerun',
+            };
+        }
+        const harnessRoot = await resolvePackReqHarnessRoot(workDir);
         return {
             workDir,
             harnessRoot,
@@ -67,22 +90,26 @@ async function resolveAutoPackReqWorkContext(positionalWorkdir, configWorkDir, r
         };
     }
     const cwd = process.cwd();
-    const harnessFromCwd = await (0, harness_resolver_1.resolveHarnessRoot)(cwd);
-    if (harnessFromCwd) {
-        return { workDir: cwd, harnessRoot: harnessFromCwd, mode: 'harness-rerun' };
+    if (await (0, harness_resolver_1.isHarnessRoot)(cwd)) {
+        return { workDir: cwd, harnessRoot: cwd, mode: 'harness-rerun' };
     }
     if (await looksLikeMaterialsPackRoot(cwd)) {
-        return { workDir: cwd, harnessRoot: null, mode: 'materials-pack' };
+        const harnessRoot = await resolvePackReqHarnessRoot(cwd);
+        return { workDir: cwd, harnessRoot, mode: harnessRoot ? 'harness-rerun' : 'materials-pack' };
     }
     if (await looksLikeRequirementsFolder(cwd)) {
-        const parent = node_path_1.default.dirname(cwd);
-        const harnessFromParent = await (0, harness_resolver_1.resolveHarnessRoot)(parent);
+        const harnessRoot = await resolvePackReqHarnessRoot(cwd);
         return {
-            workDir: parent,
-            harnessRoot: harnessFromParent,
+            workDir: cwd,
+            harnessRoot,
             requirementsPath: node_path_1.default.resolve(cwd),
-            mode: harnessFromParent ? 'harness-rerun' : 'requirements-cwd',
+            mode: harnessRoot ? 'harness-rerun' : 'requirements-cwd',
         };
     }
-    return { workDir: cwd, harnessRoot: null, mode: 'materials-pack' };
+    const harnessRoot = await resolvePackReqHarnessRoot(cwd);
+    return {
+        workDir: cwd,
+        harnessRoot,
+        mode: harnessRoot ? 'harness-rerun' : 'materials-pack',
+    };
 }

package/dist/utils/harness-name.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeHarnessName = normalizeHarnessName;
 exports.harnessNameCore = harnessNameCore;
+exports.stripHarnessSuffixFromCore = stripHarnessSuffixFromCore;
 exports.validateHarnessNameInput = validateHarnessNameInput;
 exports.harnessDirNameFromName = harnessDirNameFromName;
 /**
@@ -22,6 +23,17 @@ function harnessNameCore(raw) {
     const trimmed = raw.trim();
     return trimmed.startsWith('.') ? trimmed.slice(1) : trimmed;
 }
+/**
+ * Strip redundant `-harness` suffix(es) from an inferred name core.
+ * e.g. `requirements-harness` → `requirements`, `foo-harness-harness` → `foo`.
+ */
+function stripHarnessSuffixFromCore(core) {
+    let result = core;
+    while (result.endsWith('-harness')) {
+        result = result.slice(0, -'-harness'.length);
+    }
+    return result;
+}
 function validateHarnessNameInput(raw) {
     if (!raw?.trim()) {
         return { ok: false, message: '--harness-name 为必填参数' };
@@ -37,5 +49,11 @@ function validateHarnessNameInput(raw) {
     return { ok: true, normalized: normalizeHarnessName(raw) };
 }
 function harnessDirNameFromName(harnessName) {
-    return `${normalizeHarnessName(harnessName)}-harness`;
+    const normalized = normalizeHarnessName(harnessName);
+    const core = harnessNameCore(normalized);
+    // Avoid `.foo-harness-harness` when the short name already ends with `-harness`.
+    if (core.endsWith('-harness')) {
+        return normalized;
+    }
+    return `${normalized}-harness`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svharness",
-  "version": "0.15.13",
+  "version": "0.15.14",
   "description": "CLI scaffolder for SDD-Driven Agent-Agnostic Coding Framework (harness)",
   "bin": {
     "svharness": "./bin/cli.js",
@@ -27,7 +27,7 @@
     "clean": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\"",
     "rebuild": "npm run clean && npm run build",
     "test:requirements": "npm run build && node scripts/test-parse-blocks.js",
-    "test:auto": "npm run build && node scripts/test-auto-score.js && node scripts/test-auto-prompt.js && node scripts/test-acp-agent-cli-resolver.js && node scripts/test-auto-pack-req-context.js",
+    "test:auto": "npm run build && node scripts/test-harness-name.js && node scripts/test-doc-intake-paths.js && node scripts/test-auto-score.js && node scripts/test-auto-prompt.js && node scripts/test-acp-agent-cli-resolver.js && node scripts/test-auto-pack-req-context.js",
     "test:cli-declarations": "npm run build && node scripts/test-cli-input-declarations.js",
     "test:agent-launcher": "npm run build && node scripts/test-agent-launcher.js",
     "test:acp-agent-cli": "npm run build && node scripts/test-acp-agent-cli-resolver.js",