@gluecharm-lab/easyspecs-cli 0.0.10 → 0.0.11

package/dist/main.cjs

@@ -2251,8 +2251,8 @@ var require_resolve = __commonJS({
       }
       return count;
     }
-    function getFullPath(resolver, id = "", normalize4) {
-      if (normalize4 !== false)
+    function getFullPath(resolver, id = "", normalize5) {
+      if (normalize5 !== false)
         id = normalizeId(id);
       const p = resolver.parse(id);
       return _getFullPath(resolver, p);
@@ -3592,7 +3592,7 @@ var require_fast_uri = __commonJS({
     "use strict";
     var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4, nonSimpleDomain } = require_utils();
     var { SCHEMES, getSchemeHandler } = require_schemes();
-    function normalize4(uri, options) {
+    function normalize5(uri, options) {
       if (typeof uri === "string") {
         uri = /** @type {T} */
         serialize(parse(uri, options), options);
@@ -3828,7 +3828,7 @@ var require_fast_uri = __commonJS({
     }
     var fastUri = {
       SCHEMES,
-      normalize: normalize4,
+      normalize: normalize5,
       resolve: resolve15,
       resolveComponent,
       equal,
@@ -7395,30 +7395,35 @@ function resolveRepoRoot(flags) {
   const git = findGitRepoRoot(abs);
   return git ?? abs;
 }
-function resolveExtensionRoot() {
-  const env = process.env.EASYSPECS_EXTENSION_ROOT?.trim();
-  if (env) {
-    return path2.resolve(env);
+function resolveExtensionRootForCli(repoRoot, config) {
+  const raw = config.easyspecs?.cli?.bundledResourcesRoot?.trim();
+  if (raw) {
+    const resourcesAbs = path2.isAbsolute(raw) ? path2.normalize(raw) : path2.resolve(repoRoot, raw);
+    return path2.resolve(resourcesAbs, "..");
   }
+  return resolveExtensionRootHeuristic();
+}
+function resolveExtensionRootHeuristic() {
   const here = thisDir();
   if (here.includes(`${path2.sep}packages${path2.sep}cli${path2.sep}dist`)) {
     return path2.resolve(here, "..", "..", "..");
   }
   return path2.resolve(here, "..", "..");
 }
-function resolveOpenCodeAgentsDir() {
-  const resEnv = process.env.EASYSPECS_CLI_RESOURCES?.trim();
-  if (resEnv) {
-    return path2.join(path2.resolve(resEnv), "opencode-agents");
+function resolveOpenCodeAgentsDir(repoRoot, config) {
+  const raw = config.easyspecs?.cli?.bundledResourcesRoot?.trim();
+  if (raw) {
+    const resourcesAbs = path2.isAbsolute(raw) ? path2.normalize(raw) : path2.resolve(repoRoot, raw);
+    return path2.join(resourcesAbs, "opencode-agents");
   }
   const here = thisDir();
   if (here.includes(`${path2.sep}packages${path2.sep}cli${path2.sep}dist`)) {
     return path2.join(here, "..", "resources", "opencode-agents");
   }
-  return path2.join(resolveExtensionRoot(), "resources", "opencode-agents");
+  return path2.join(resolveExtensionRootHeuristic(), "resources", "opencode-agents");
 }
 function initApiBaseUrlForCli(repoRoot, flags, config) {
-  const extensionRoot2 = resolveExtensionRoot();
+  const extensionRoot2 = resolveExtensionRootForCli(repoRoot, config);
   setApiBaseUrlExtensionRoot(extensionRoot2);
   return resolveEasyspecsApiBaseUrlForCli({
     flagApiBaseUrl: flags.apiBaseUrl,
@@ -7429,7 +7434,7 @@ function initApiBaseUrlForCli(repoRoot, flags, config) {
 function assertAgentsDirExists(agentsDir) {
   if (!fs2.existsSync(agentsDir)) {
     throw new Error(
-      `OpenCode agents directory missing: ${agentsDir}. Set EASYSPECS_EXTENSION_ROOT or EASYSPECS_CLI_RESOURCES, or run \`npm run build:cli\` to copy resources.`
+      `OpenCode agents directory missing: ${agentsDir}. Set easyspecs.cli.bundledResourcesRoot in .easyspecs/config.json to your EasySpecs resources directory (folder containing opencode-agents/), or run "npm run build:cli" so packages/cli ships resources.`
     );
   }
 }
@@ -7501,7 +7506,8 @@ function mergeEasyspecsCliSettings(cfg, overrides = {}) {
     maxDelayMs: orch.maxDelayMs ?? 48e4,
     maxOuterIterationsPerPhase: maxOuter,
     maxMacroPingPongCycles: orch.maxMacroPingPongCycles ?? 5,
-    synthesisRemediationShareBackoff: orch.synthesisRemediationShareBackoff !== false
+    synthesisRemediationShareBackoff: orch.synthesisRemediationShareBackoff !== false,
+    debugPhases: es.macro?.debug === true
   };
   const openCodeChildEnv = buildOpenCodeProviderEnvFromConfig(cfg, overrides.repoRoot);
   const projectConfigOverlay = cfg.easyspecs?.openCodeRuntime?.projectConfigOverlay;
@@ -7640,13 +7646,43 @@ function mergeEasyspecsConfigDefaults(defaults, partial) {
       esIn.analysis
     ),
     orchestration: { ...defEs.orchestration, ...esIn.orchestration },
-    openCodeRuntime: mergeOpenCodeRuntime(defEs.openCodeRuntime, esIn.openCodeRuntime)
+    openCodeRuntime: mergeOpenCodeRuntime(defEs.openCodeRuntime, esIn.openCodeRuntime),
+    diagnose: mergeDiagnoseBlock(defEs.diagnose, esIn.diagnose),
+    upload: { ...defEs.upload, ...esIn.upload },
+    macro: { ...defEs.macro, ...esIn.macro },
+    cli: { ...defEs.cli, ...esIn.cli },
+    auth: mergeAuthBlock(defEs.auth, esIn.auth)
   };
   return {
     schemaVersion: partial.schemaVersion ?? defaults.schemaVersion,
     easyspecs: mergedEs
   };
 }
+function mergeDiagnoseBlock(base, over) {
+  if (!over) {
+    return { ...base };
+  }
+  const zBase = base.zeroReference ?? { maxPercentNonReferenced: null };
+  const zOver = over.zeroReference;
+  const cBase = base.coordinationDuplicates ?? { strict: true };
+  const cOver = over.coordinationDuplicates;
+  return {
+    zeroReference: {
+      maxPercentNonReferenced: zOver?.maxPercentNonReferenced !== void 0 ? zOver.maxPercentNonReferenced : zBase.maxPercentNonReferenced ?? null
+    },
+    coordinationDuplicates: {
+      strict: cOver?.strict !== void 0 ? cOver.strict : cBase.strict !== false
+    }
+  };
+}
+function mergeAuthBlock(base, over) {
+  if (!over) {
+    return { ...base };
+  }
+  return {
+    ciLogin: { ...base.ciLogin, ...over.ciLogin }
+  };
+}
 function mergeAnalysisBlock(base, over) {
   if (!over || Object.keys(over).length === 0) {
     return { ...base };
@@ -7707,7 +7743,7 @@ function getDefaultEasyspecsConfig() {
     projectConfigOverlay: {}
   };
   return {
-    schemaVersion: 1,
+    schemaVersion: 2,
     easyspecs: {
       deploymentEnvironment: "production",
       apiBaseUrl: PRODUCTION_SYSTEM_MANAGER_URL,
@@ -7722,7 +7758,15 @@ function getDefaultEasyspecsConfig() {
         promoteContextToWorkspace: true
       },
       orchestration: {},
-      openCodeRuntime
+      openCodeRuntime,
+      diagnose: {
+        zeroReference: { maxPercentNonReferenced: null },
+        coordinationDuplicates: { strict: true }
+      },
+      upload: { contextDirectory: "" },
+      macro: { debug: false },
+      cli: { bundledResourcesRoot: "" },
+      auth: { ciLogin: {} }
     }
   };
 }
@@ -7910,6 +7954,11 @@ function redactEasyspecsConfigRootForDump(cfg) {
       }
     }
   }
+  const authCi = es?.auth;
+  const ciLogin = authCi?.ciLogin;
+  if (ciLogin && typeof ciLogin === "object" && "password" in ciLogin) {
+    ciLogin.password = "(redacted)";
+  }
   return o;
 }
 
@@ -12687,13 +12736,6 @@ function hasMarker(resourcesRoot) {
   return fs22.existsSync(path20.join(resourcesRoot, CONTEXT_LIST_MARKER));
 }
 function resolveRepoResourcesRoot() {
-  const env = process.env.EASYSPECS_EXTENSION_ROOT?.trim();
-  if (env) {
-    const r = path20.join(path20.resolve(env), "resources");
-    if (hasMarker(r)) {
-      return r;
-    }
-  }
   const candidates = [path20.join(__dirname, "..", "resources"), path20.join(__dirname, "..", "..", "resources")];
   for (const c of candidates) {
     const abs = path20.resolve(c);
@@ -12702,7 +12744,7 @@ function resolveRepoResourcesRoot() {
     }
   }
   throw new Error(
-    `Could not find EasySpecs bundled resources (e.g. ${CONTEXT_LIST_MARKER}). Set EASYSPECS_EXTENSION_ROOT to your easyspecs.ai-vsc-extension repo root, or reinstall @gluecharm-lab/easyspecs-cli after \`npm run build:cli\` so packages/cli/resources contains the full resources tree.`
+    `Could not find EasySpecs bundled resources (e.g. ${CONTEXT_LIST_MARKER}). Set easyspecs.cli.bundledResourcesRoot in .easyspecs/config.json to your resources directory, or reinstall @gluecharm-lab/easyspecs-cli after \`npm run build:cli\` so packages/cli/resources contains the full resources tree.`
   );
 }
 function resolveContextListSchemasDir() {
@@ -18232,7 +18274,7 @@ function buildMacroOrchestrationDepsHeadless(input) {
     config: { ...macroConfig, ...input.synthesisOnly ? { synthesisOnly: true } : {} },
     sleep: (ms) => macroSleep(ms, signal),
     post: (payload) => {
-      if (process.env.EASYSPECS_CLI_MACRO_DEBUG === "1") {
+      if (macroConfig.debugPhases === true) {
         log(`[macro] phases=${payload.phases.map((p) => `${p.key}:${p.status}`).join(",")} elapsed=${String(payload.totalElapsedMs)}ms`);
       }
     },
@@ -19448,16 +19490,16 @@ function parseAuthLoginTail(tail) {
     return { ok: false, error: `Unexpected argument: ${a}` };
   }
   if (!email?.trim()) {
-    return { ok: false, error: "Missing --email (or use --ci with EASYSPECS_EMAIL / EASYSPECS_PASSWORD)" };
+    return { ok: false, error: "Missing --email (or use --ci with easyspecs.auth.ciLogin in .easyspecs/config.json)" };
   }
   if (password === void 0) {
-    return { ok: false, error: "Missing --password (or use --ci with EASYSPECS_EMAIL / EASYSPECS_PASSWORD)" };
+    return { ok: false, error: "Missing --password (or use --ci with easyspecs.auth.ciLogin in .easyspecs/config.json)" };
   }
   return { ok: true, creds: { email: email.trim(), password } };
 }
 
 // ../../src/cli/main.ts
-var PKG_VERSION = "0.0.9";
+var PKG_VERSION = "0.0.11";
 function logErr(flags, ...a) {
   if (!flags.json) {
     console.error(...a);
@@ -19564,9 +19606,9 @@ function requireOpenCode(merged, flags) {
   }
   return readiness;
 }
-async function runResumeRemediationPool(storage, repoRoot, analysisRoot, merged, flags) {
+async function runResumeRemediationPool(storage, repoRoot, analysisRoot, merged, flags, repoConfig) {
   requireOpenCode(merged, flags);
-  const agentsDir = resolveOpenCodeAgentsDir();
+  const agentsDir = resolveOpenCodeAgentsDir(repoRoot, repoConfig);
   assertAgentsDirExists(agentsDir);
   const ctxDir = path43.join(analysisRoot, ".gluecharm", "context");
   const snap = readArtefactRunSnapshot(storage);
@@ -19775,7 +19817,7 @@ async function main() {
         logErr(flags, "Usage: easyspecs-cli doctor [--readiness] [--inspect-config]");
         process.exit(ExitCode.usage);
       }
-      const agentsDir = resolveOpenCodeAgentsDir();
+      const agentsDir = resolveOpenCodeAgentsDir(repoRoot, repoConfig);
       const agentsOk = fs43.existsSync(agentsDir);
       const oc = getOpenCodeReadiness({
         executable: merged.openCodeExecutable,
@@ -19840,17 +19882,18 @@ async function main() {
         process.exit(ExitCode.usage);
       }
       const parsedCli = parseAuthLoginTail(tailForCreds);
-      const envEmail = process.env.EASYSPECS_EMAIL?.trim();
-      const envPassword = process.env.EASYSPECS_PASSWORD?.trim();
-      const useLegacyCiEnv = !parsedCli.ok && (flags.ci || tailFull.includes("--ci")) && Boolean(envEmail) && Boolean(envPassword);
+      const ciLogin = repoConfig.easyspecs?.auth?.ciLogin;
+      const cfgEmail = ciLogin?.email?.trim();
+      const cfgPassword = ciLogin?.password;
+      const useCiConfig = !parsedCli.ok && (flags.ci || tailFull.includes("--ci")) && Boolean(cfgEmail) && typeof cfgPassword === "string" && cfgPassword.length > 0;
       let email;
       let password;
       if (parsedCli.ok) {
         email = parsedCli.creds.email;
         password = parsedCli.creds.password;
-      } else if (useLegacyCiEnv) {
-        email = envEmail;
-        password = envPassword;
+      } else if (useCiConfig) {
+        email = cfgEmail;
+        password = cfgPassword;
       } else {
         logErr(flags, parsedCli.error);
         logErr(
@@ -19859,7 +19902,7 @@ async function main() {
         );
         logErr(
           flags,
-          "Legacy: easyspecs-cli --ci auth login  (requires EASYSPECS_EMAIL and EASYSPECS_PASSWORD)"
+          "Non-interactive (--ci): set easyspecs.auth.ciLogin.email and easyspecs.auth.ciLogin.password in .easyspecs/config.json"
         );
         process.exit(ExitCode.usage);
       }
@@ -19912,7 +19955,7 @@ async function main() {
       const storage = createFileBackedWorkspaceState(repoRoot);
       const { worktree } = parseWorktreeFlag(pos.slice(3));
       const analysisRoot = resolveAdHocCheckoutRoot(repoRoot, storage, worktree);
-      const poolRes = await runResumeRemediationPool(storage, repoRoot, analysisRoot, merged, flags);
+      const poolRes = await runResumeRemediationPool(storage, repoRoot, analysisRoot, merged, flags, repoConfig);
       if (poolRes.cancelled) {
         finish(ExitCode.cancelled, { ok: false, error: "Remediation cancelled.", analysisWorktreePath: analysisRoot });
       }
@@ -19929,7 +19972,7 @@ async function main() {
       const storage = createFileBackedWorkspaceState(repoRoot);
       const { worktree } = parseWorktreeFlag(pos.slice(3));
       const analysisRoot = resolveAdHocCheckoutRoot(repoRoot, storage, worktree);
-      const poolRes = await runResumeRemediationPool(storage, repoRoot, analysisRoot, merged, flags);
+      const poolRes = await runResumeRemediationPool(storage, repoRoot, analysisRoot, merged, flags, repoConfig);
       if (poolRes.cancelled) {
         finish(ExitCode.cancelled, { ok: false, error: "Remediation cancelled.", analysisWorktreePath: analysisRoot });
       }
@@ -19944,7 +19987,7 @@ async function main() {
     }
     if (pos[0] === "run" && pos[1] === "synthesis" && pos.length === 2) {
       requireOpenCode(merged, flags);
-      const agentsDir = resolveOpenCodeAgentsDir();
+      const agentsDir = resolveOpenCodeAgentsDir(repoRoot, repoConfig);
       assertAgentsDirExists(agentsDir);
       const storage = createFileBackedWorkspaceState(repoRoot);
       const result = await runContextArtefactPipelineAsync(
@@ -20012,8 +20055,8 @@ async function main() {
         });
         if (res.ok) {
           const d = res.document;
-          const maxPct = Number(process.env.EASYSPECS_MAX_PERCENT_NON_REFERENCED ?? "");
-          if (Number.isFinite(maxPct) && d.metrics.percentNonReferenced > maxPct) {
+          const maxPct = repoConfig.easyspecs?.diagnose?.zeroReference?.maxPercentNonReferenced;
+          if (maxPct !== null && maxPct !== void 0 && Number.isFinite(maxPct) && d.metrics.percentNonReferenced > maxPct) {
             finish(ExitCode.validation, {
               ok: false,
               error: `percentNonReferenced ${String(d.metrics.percentNonReferenced)} > ${String(maxPct)}`
@@ -20032,7 +20075,7 @@ async function main() {
           sourceRoot: rootKind === "worktree" ? "worktree" : "workspace"
         });
         if (res.ok) {
-          const strict = process.env.EASYSPECS_DUPLICATES_STRICT !== "0";
+          const strict = repoConfig.easyspecs?.diagnose?.coordinationDuplicates?.strict !== false;
           const bad = strict && ((res.groupCount ?? 0) > 0 || (res.orphanMarkdownCount ?? 0) > 0);
           finish(bad ? ExitCode.validation : ExitCode.ok, {
             ok: !bad,
@@ -20076,7 +20119,7 @@ async function main() {
           "[SRS-30] zero-reference remediation runs OpenCode agents per file; expect cost and runtime similar to the extension macro phase."
         );
         requireOpenCode(merged, flags);
-        const agentsDir = resolveOpenCodeAgentsDir();
+        const agentsDir = resolveOpenCodeAgentsDir(repoRoot, repoConfig);
         assertAgentsDirExists(agentsDir);
         const storage = createFileBackedWorkspaceState(repoRoot);
         const { worktree: wtAce } = parseWorktreeFlag(pos.slice(2));
@@ -20126,11 +20169,11 @@ async function main() {
       if (wantsUpload && !uploadSession) {
         finish(ExitCode.auth, {
           ok: false,
-          error: "analysis --upload requires `easyspecs-cli auth login --email \u2026 --password \u2026` (or legacy `--ci` + EASYSPECS_EMAIL/PASSWORD)."
+          error: "analysis --upload requires `easyspecs-cli auth login --email \u2026 --password \u2026` or `--ci` with easyspecs.auth.ciLogin in .easyspecs/config.json."
         });
       }
       const skipBackendSync = !wantsUpload;
-      const agentsDir = resolveOpenCodeAgentsDir();
+      const agentsDir = resolveOpenCodeAgentsDir(repoRoot, repoConfig);
       assertAgentsDirExists(agentsDir);
       const storage = createFileBackedWorkspaceState(repoRoot);
       const runBackendSyncImpl = wantsUpload && uploadSession ? async () => {
@@ -20208,15 +20251,16 @@ async function main() {
       if (sessRaw === void 0) {
         finish(ExitCode.auth, {
           ok: false,
-          error: "auth login first (`auth login --email \u2026 --password \u2026`, or legacy `--ci` + env)"
+          error: "auth login first (`easyspecs-cli auth login --email \u2026 --password \u2026`, or `--ci` with easyspecs.auth.ciLogin in .easyspecs/config.json)"
         });
       }
       const sess = sessRaw;
       let ctxDir = path43.join(repoRoot, ".gluecharm", "context");
       if (pos[1] === "republish") {
-        const fromEnv = process.env.EASYSPECS_UPLOAD_CONTEXT_DIR?.trim();
-        if (fromEnv && fs43.existsSync(path43.join(fromEnv, ".."))) {
-          ctxDir = path43.resolve(fromEnv);
+        const fromCfg = repoConfig.easyspecs?.upload?.contextDirectory?.trim();
+        const resolvedOverride = fromCfg && fromCfg.length > 0 ? path43.isAbsolute(fromCfg) ? path43.normalize(fromCfg) : path43.resolve(repoRoot, fromCfg) : "";
+        if (resolvedOverride && fs43.existsSync(path43.join(resolvedOverride, ".."))) {
+          ctxDir = resolvedOverride;
         } else {
           const storage = createFileBackedWorkspaceState(repoRoot);
           const snap = readAnalysisWorkspaceSnapshot(storage);
@@ -20224,7 +20268,7 @@ async function main() {
           if (!wt) {
             finish(ExitCode.misconfiguration, {
               ok: false,
-              error: "upload republish requires an analysis worktree with .gluecharm/context (`easyspecs-cli run synthesis` first), or set EASYSPECS_UPLOAD_CONTEXT_DIR."
+              error: "upload republish requires an analysis worktree with .gluecharm/context (`easyspecs-cli run synthesis` first), or set easyspecs.upload.contextDirectory in .easyspecs/config.json."
             });
           }
           ctxDir = wt;