@tekyzinc/gsd-t 3.11.10 → 3.12.10

package/bin/gsd-t.js

@@ -433,8 +433,8 @@ function ensureGitignoreEntries(projectDir, entries) {
 
 // Install the Context Meter into a project directory.
 // Copies scripts/gsd-t-context-meter.js, scripts/context-meter/*.js (runtime
-// only — skips .test.js and test-injector.js), and the config template (if
-// missing). Also appends entries to .gitignore.
+// only — skips .test.js), and the config template (if missing). Also appends
+// entries to .gitignore.
 function installContextMeter(projectDir) {
   try {
     // 1. Copy gsd-t-context-meter.js → {projectDir}/scripts/
@@ -486,9 +486,7 @@ function installContextMeter(projectDir) {
         return false;
       }
       for (const fname of depFiles) {
-        // Skip test files and test-only infrastructure
         if (fname.includes(".test.")) continue;
-        if (fname === "test-injector.js") continue;
         const fsrc = path.join(depsSrcDir, fname);
         const fdest = path.join(depsDestDir, fname);
         try {
@@ -1232,9 +1230,6 @@ async function doInstall(opts = {}) {
   saveInstalledVersion();
 
   showInstallSummary(gsdtCommands.length, utilityCommands.length);
-
-  // Interactive prompt (skipped silently in non-TTY shells)
-  await promptForApiKeyIfMissing(resolveApiKeyEnvVar(process.cwd()));
 }
 
 function showInstallSummary(gsdtCount, utilCount) {
@@ -1444,9 +1439,6 @@ async function doInit(projectName) {
   if (registerProject(projectDir)) success("Registered in ~/.claude/.gsd-t-projects");
 
   showInitTree(projectDir);
-
-  // Interactive prompt (skipped silently in non-TTY shells)
-  await promptForApiKeyIfMissing(resolveApiKeyEnvVar(projectDir));
 }
 
 function showInitTree(projectDir) {
@@ -1523,12 +1515,7 @@ function showStatusContextMeter() {
     const rel = state.timestamp ? formatRelativeTime(state.timestamp) : "never measured";
     log(`  ${RED}${BOLD}✗ CONTEXT METER DEAD${RESET} ${RED}— error: ${code}, last check: ${rel}${RESET}`);
     log(`    ${RED}The context-window guardrail is NOT working. Long sessions will hit /compact.${RESET}`);
-    if (code === "missing_key") {
-      log(`    ${YELLOW}Fix: export ANTHROPIC_API_KEY in your shell profile${RESET}`);
-      log(`    ${YELLOW}     (measurement only — inference stays on Claude Code subscription)${RESET}`);
-    } else {
-      log(`    ${YELLOW}Fix: run 'gsd-t doctor' for diagnostics${RESET}`);
-    }
+    log(`    ${YELLOW}Fix: run 'gsd-t doctor' for diagnostics${RESET}`);
     return;
   }
 
@@ -1981,8 +1968,7 @@ const PROJECT_BIN_TOOLS = [
   "archive-progress.cjs", "log-tail.cjs", "context-budget-audit.cjs",
   "context-meter-config.cjs", "token-budget.cjs",
   "gsd-t-unattended.cjs", "gsd-t-unattended-platform.cjs", "gsd-t-unattended-safety.cjs",
-  "handoff-lock.cjs", "headless-auto-spawn.cjs", "runway-estimator.cjs",
-  "token-telemetry.cjs", "token-optimizer.cjs",
+  "handoff-lock.cjs", "headless-auto-spawn.cjs",
 ];
 
 function copyBinToolsToProject(projectDir, projectName) {
@@ -2308,8 +2294,8 @@ function checkDoctorCgc() {
   return issues;
 }
 
-// Verify context meter wiring: API key env var, hook registration,
-// hook script presence, config validity, and a live count_tokens dry-run.
+// Verify context meter wiring: hook registration, hook script presence,
+// config validity, and a local estimation dry-run.
 // Returns number of issues (RED results). Mirrors checkDoctorCgc shape.
 async function checkDoctorContextMeter(projectDir) {
   let issues = 0;
@@ -2317,8 +2303,8 @@ async function checkDoctorContextMeter(projectDir) {
 
   const cwd = projectDir || process.cwd();
 
-  // Load config (used by checks 1, 4, and 5). Missing file → defaults; invalid
-  // JSON or schema-mismatch → throws (handled in Check 4).
+  // Load config (used by checks 3 and 4). Missing file → defaults; invalid
+  // JSON or schema-mismatch → throws (handled in Check 3).
   let cfg = null;
   let cfgLoadErr = null;
   try {
@@ -2327,19 +2313,8 @@ async function checkDoctorContextMeter(projectDir) {
   } catch (e) {
     cfgLoadErr = e;
   }
-  const apiKeyEnvVar = (cfg && cfg.apiKeyEnvVar) || "ANTHROPIC_API_KEY";
-
-  // Check 1: API key env var present
-  const apiKeyValue = process.env[apiKeyEnvVar];
-  const apiKeyPresent = typeof apiKeyValue === "string" && apiKeyValue.length > 0;
-  if (apiKeyPresent) {
-    success(`API key present ($${apiKeyEnvVar})`);
-  } else {
-    error(`Missing API key: set $${apiKeyEnvVar} — https://console.anthropic.com/settings/keys`);
-    issues++;
-  }
 
-  // Check 2: Hook registered in ~/.claude/settings.json
+  // Check 1: Hook registered in ~/.claude/settings.json
   let hookRegistered = false;
   try {
     if (fs.existsSync(SETTINGS_JSON)) {
@@ -2367,7 +2342,7 @@ async function checkDoctorContextMeter(projectDir) {
     issues++;
   }
 
-  // Check 3: Hook script file exists in project
+  // Check 2: Hook script file exists in project
   const scriptPath = path.join(cwd, "scripts", CONTEXT_METER_SCRIPT);
   if (fs.existsSync(scriptPath)) {
     success("Hook script present");
@@ -2376,7 +2351,7 @@ async function checkDoctorContextMeter(projectDir) {
     issues++;
   }
 
-  // Check 4: Config file parses via loader
+  // Check 3: Config file parses via loader
   const configPath = path.join(cwd, CONTEXT_METER_CONFIG_DEST);
   if (cfgLoadErr) {
     error(`Config file invalid: ${cfgLoadErr.message} — fix ${CONTEXT_METER_CONFIG_DEST}`);
@@ -2387,34 +2362,27 @@ async function checkDoctorContextMeter(projectDir) {
     warn("Using default config — run gsd-t install to copy template");
   }
 
-  // Check 5: Dry-run count_tokens API call (skip if no API key)
-  if (!apiKeyPresent) {
-    log(`  ${DIM}Skipped count_tokens dry-run (no API key)${RESET}`);
+  // Check 4: Dry-run local token estimation
+  const estimatorPath = path.join(cwd, "scripts", "context-meter", "estimate-tokens.js");
+  if (!fs.existsSync(estimatorPath)) {
+    error("Token estimator missing at scripts/context-meter/estimate-tokens.js — run gsd-t update");
+    issues++;
   } else {
-    const clientPath = path.join(cwd, "scripts", "context-meter", "count-tokens-client.js");
-    if (!fs.existsSync(clientPath)) {
-      error("count_tokens client missing at scripts/context-meter/count-tokens-client.js — run gsd-t update");
-      issues++;
-    } else {
-      try {
-        const { countTokens } = require(clientPath);
-        const result = await countTokens({
-          apiKey: apiKeyValue,
-          model: "claude-opus-4-6",
-          system: "",
-          messages: [{ role: "user", content: [{ type: "text", text: "ping" }] }],
-          timeoutMs: 5000,
-        });
-        if (result && typeof result.inputTokens === "number") {
-          success(`count_tokens dry-run OK (${result.inputTokens} tokens)`);
-        } else {
-          error("count_tokens API call failed — check API key and network");
-          issues++;
-        }
-      } catch (e) {
-        error(`count_tokens dry-run threw: ${e.message}`);
+    try {
+      const { estimateTokens } = require(estimatorPath);
+      const result = estimateTokens({
+        system: "",
+        messages: [{ role: "user", content: [{ type: "text", text: "ping" }] }],
+      });
+      if (result && typeof result.inputTokens === "number") {
+        success(`Token estimator dry-run OK (${result.inputTokens} tokens)`);
+      } else {
+        error("Token estimator returned null");
         issues++;
       }
+    } catch (e) {
+      error(`Token estimator dry-run threw: ${e.message}`);
+      issues++;
     }
   }
 
@@ -2750,7 +2718,7 @@ function doHeadlessExec(command, cmdArgs, flags) {
   let processExitCode = 0;
 
   try {
-    const result = execFileSync("claude", ["-p", prompt], {
+    const result = execFileSync("claude", ["-p", "--dangerously-skip-permissions", prompt], {
       encoding: "utf8",
       timeout: timeoutMs,
       stdio: ["pipe", "pipe", "pipe"],
@@ -3274,117 +3242,10 @@ function showHeadlessHelp() {
   log(`  ${DIM}$${RESET} gsd-t headless query domains\n`);
 }
 
-// ─── Metrics (M35 token telemetry CLI) ────────────────────────────────────────
-
-function parseMetricsByFlag(args) {
-  const byArg = args.find(a => a.startsWith("--by="));
-  if (!byArg) return [];
-  const raw = byArg.slice(5).trim();
-  if (!raw) return [];
-  return raw.split(",").map(s => s.trim()).filter(Boolean);
-}
+// ─── Metrics (removed in v3.12 — M38 meter reduction) ─────────────────────────
 
-function formatPct(v) {
-  if (v === null || v === undefined || Number.isNaN(v)) return "—";
-  return `${Number(v).toFixed(1)}%`;
-}
-
-function formatInt(v) {
-  if (v === null || v === undefined || Number.isNaN(v)) return "—";
-  return String(Math.round(Number(v)));
-}
-
-function doMetrics(args) {
-  const projectDir = process.cwd();
-  let tt;
-  try {
-    tt = require(path.join(projectDir, "bin", "token-telemetry.js"));
-  } catch (e) {
-    error(`bin/token-telemetry.js not found in ${projectDir} — run gsd-t install first.`);
-    process.exit(1);
-  }
-
-  const records = tt.readAll(projectDir);
-  if (records.length === 0) {
-    log(`${DIM}No telemetry records yet — .gsd-t/token-metrics.jsonl is empty or missing.${RESET}`);
-    return;
-  }
-
-  const isTokens = args.includes("--tokens");
-  const isHalts = args.includes("--halts");
-  const isContextWindow = args.includes("--context-window");
-
-  if (!isTokens && !isHalts && !isContextWindow) {
-    log(`${YELLOW}Specify at least one of: --tokens, --halts, --context-window${RESET}`);
-    return;
-  }
-
-  if (isHalts) {
-    const halts = records.filter(r => r.halt_type);
-    log(`\n${BOLD}Halts — ${halts.length} record(s)${RESET}`);
-    if (halts.length === 0) {
-      log(`${DIM}  (no halts recorded — all spawns completed normally)${RESET}\n`);
-    } else {
-      const byType = {};
-      for (const r of halts) {
-        const key = String(r.halt_type);
-        byType[key] = (byType[key] || 0) + 1;
-      }
-      for (const [type, count] of Object.entries(byType).sort()) {
-        log(`  ${CYAN}${type.padEnd(24)}${RESET} ${count}`);
-      }
-      log("");
-    }
-  }
-
-  if (isTokens) {
-    const by = parseMetricsByFlag(args);
-    if (by.length === 0) {
-      const totalConsumed = records.reduce((a, r) => a + (Number(r.tokens_consumed) || 0), 0);
-      const totalDuration = records.reduce((a, r) => a + (Number(r.duration_s) || 0), 0);
-      log(`\n${BOLD}Tokens — ${records.length} spawn(s)${RESET}`);
-      log(`  total tokens consumed:  ${formatInt(totalConsumed)}`);
-      log(`  total duration (s):     ${formatInt(totalDuration)}`);
-      if (records.length > 0) {
-        log(`  mean tokens/spawn:      ${formatInt(totalConsumed / records.length)}`);
-      }
-      log("");
-    } else {
-      const groups = tt.aggregate(records, { by });
-      log(`\n${BOLD}Tokens by ${by.join(",")} — ${groups.length} group(s)${RESET}`);
-      const keyHeader = by.join("/");
-      log(`  ${keyHeader.padEnd(36)}  ${"count".padStart(7)}  ${"total".padStart(12)}  ${"mean".padStart(10)}  ${"median".padStart(10)}  ${"p95".padStart(10)}`);
-      log(`  ${"-".repeat(36)}  ${"-".repeat(7)}  ${"-".repeat(12)}  ${"-".repeat(10)}  ${"-".repeat(10)}  ${"-".repeat(10)}`);
-      for (const g of groups) {
-        const label = by.map(k => g.key[k] == null ? "—" : String(g.key[k])).join("/");
-        log(`  ${label.padEnd(36)}  ${formatInt(g.count).padStart(7)}  ${formatInt(g.total_tokens).padStart(12)}  ${formatInt(g.mean).padStart(10)}  ${formatInt(g.median).padStart(10)}  ${formatInt(g.p95).padStart(10)}`);
-      }
-      log("");
-    }
-  }
-
-  if (isContextWindow) {
-    log(`\n${BOLD}Context window trend — ${records.length} record(s)${RESET}`);
-    const withPct = records.filter(r => r.context_window_pct_after != null && !Number.isNaN(Number(r.context_window_pct_after)));
-    if (withPct.length === 0) {
-      log(`${DIM}  (no context-window measurements in records)${RESET}\n`);
-    } else {
-      const sorted = [...withPct].map(r => Number(r.context_window_pct_after)).sort((a, b) => a - b);
-      const min = sorted[0];
-      const max = sorted[sorted.length - 1];
-      const mean = sorted.reduce((a, b) => a + b, 0) / sorted.length;
-      const p95 = sorted[Math.min(sorted.length - 1, Math.floor(sorted.length * 0.95))];
-      log(`  min:   ${formatPct(min)}`);
-      log(`  mean:  ${formatPct(mean)}`);
-      log(`  p95:   ${formatPct(p95)}`);
-      log(`  max:   ${formatPct(max)}`);
-      const atWarn = withPct.filter(r => Number(r.context_window_pct_after) >= 70).length;
-      const atStop = withPct.filter(r => Number(r.context_window_pct_after) >= 85).length;
-      log(`  spawns at warn band (≥70%):  ${atWarn}`);
-      log(`  spawns at stop band (≥85%):  ${atStop}`);
-      log("");
-    }
-  }
+function doMetrics(_args) {
+  log(`${DIM}metrics removed in v3.12 — context meter is no longer telemetry-instrumented${RESET}`);
 }
 
 function showHelp() {
@@ -3544,6 +3405,14 @@ if (require.main === module) {
     case "headless":
       doHeadless(args.slice(1));
       break;
+    case "unattended": {
+      const { spawnSync } = require("child_process");
+      const cjs = path.join(__dirname, "gsd-t-unattended.cjs");
+      const res = spawnSync(process.execPath, [cjs, ...args.slice(1)], {
+        stdio: "inherit",
+      });
+      process.exit(res.status == null ? 1 : res.status);
+    }
     case "metrics":
       doMetrics(args.slice(1));
       break;

package/bin/headless-auto-spawn.cjs

@@ -53,20 +53,54 @@ module.exports = {
  *   args?: string[],
  *   continue_from?: string,
  *   projectDir?: string,
- *   context?: object
+ *   context?: object,
+ *   sessionContext?: object,
+ *   sessionId?: string,
+ *   watch?: boolean,
+ *   spawnType?: 'primary' | 'validation'
  * }} opts
- * @returns {{ id: string, pid: number, logPath: string, timestamp: string }}
+ * @returns {{ id: string | null, pid: number | null, logPath: string | null, timestamp: string, mode: 'headless' | 'in-context' }}
  */
 function autoSpawnHeadless(opts) {
   const command = opts.command;
   const args = opts.args || [];
   const continue_from = opts.continue_from || ".";
   const projectDir = opts.projectDir || process.cwd();
-  const context = opts.context || null;
+  const context = opts.context || opts.sessionContext || null;
+  const watch = opts.watch === true;
+  const spawnType = opts.spawnType || "primary";
 
   if (!command || typeof command !== "string") {
     throw new Error("autoSpawnHeadless: `command` is required");
   }
+  if (spawnType !== "primary" && spawnType !== "validation") {
+    throw new Error(
+      `autoSpawnHeadless: \`spawnType\` must be 'primary' or 'validation' (got ${JSON.stringify(spawnType)})`,
+    );
+  }
+
+  // Propagation rules (headless-default-contract §2):
+  //   watch=true + primary    → signal in-context fallback (caller uses Task)
+  //   watch=true + validation → warn on stderr; proceed headless
+  //   watch=false             → headless (default behavior)
+  if (watch && spawnType === "primary") {
+    return {
+      id: null,
+      pid: null,
+      logPath: null,
+      timestamp: new Date().toISOString(),
+      mode: "in-context",
+    };
+  }
+  if (watch && spawnType === "validation") {
+    try {
+      process.stderr.write(
+        `[headless-default] --watch ignored for validation spawn type: ${spawnType}\n`,
+      );
+    } catch (_) {
+      /* best effort */
+    }
+  }
 
   const timestamp = new Date().toISOString();
   const id = makeSessionId(command, new Date());
@@ -145,7 +179,13 @@ function autoSpawnHeadless(opts) {
   // a detached approach that survives even after the parent's `unref()`.
   installCompletionWatcher({ projectDir, id, logPath, pid, startTimestamp: timestamp });
 
-  return { id, pid, logPath: path.relative(projectDir, logPath), timestamp };
+  return {
+    id,
+    pid,
+    logPath: path.relative(projectDir, logPath),
+    timestamp,
+    mode: "headless",
+  };
 }
 
 // ── makeSessionId ────────────────────────────────────────────────────────────

package/bin/headless-auto-spawn.js

@@ -53,20 +53,54 @@ module.exports = {
  *   args?: string[],
  *   continue_from?: string,
  *   projectDir?: string,
- *   context?: object
+ *   context?: object,
+ *   sessionContext?: object,
+ *   sessionId?: string,
+ *   watch?: boolean,
+ *   spawnType?: 'primary' | 'validation'
  * }} opts
- * @returns {{ id: string, pid: number, logPath: string, timestamp: string }}
+ * @returns {{ id: string | null, pid: number | null, logPath: string | null, timestamp: string, mode: 'headless' | 'in-context' }}
  */
 function autoSpawnHeadless(opts) {
   const command = opts.command;
   const args = opts.args || [];
   const continue_from = opts.continue_from || ".";
   const projectDir = opts.projectDir || process.cwd();
-  const context = opts.context || null;
+  const context = opts.context || opts.sessionContext || null;
+  const watch = opts.watch === true;
+  const spawnType = opts.spawnType || "primary";
 
   if (!command || typeof command !== "string") {
     throw new Error("autoSpawnHeadless: `command` is required");
   }
+  if (spawnType !== "primary" && spawnType !== "validation") {
+    throw new Error(
+      `autoSpawnHeadless: \`spawnType\` must be 'primary' or 'validation' (got ${JSON.stringify(spawnType)})`,
+    );
+  }
+
+  // Propagation rules (headless-default-contract §2):
+  //   watch=true + primary    → signal in-context fallback (caller uses Task)
+  //   watch=true + validation → warn on stderr; proceed headless
+  //   watch=false             → headless (default behavior)
+  if (watch && spawnType === "primary") {
+    return {
+      id: null,
+      pid: null,
+      logPath: null,
+      timestamp: new Date().toISOString(),
+      mode: "in-context",
+    };
+  }
+  if (watch && spawnType === "validation") {
+    try {
+      process.stderr.write(
+        `[headless-default] --watch ignored for validation spawn type: ${spawnType}\n`,
+      );
+    } catch (_) {
+      /* best effort */
+    }
+  }
 
   const timestamp = new Date().toISOString();
   const id = makeSessionId(command, new Date());
@@ -145,7 +179,13 @@ function autoSpawnHeadless(opts) {
   // a detached approach that survives even after the parent's `unref()`.
   installCompletionWatcher({ projectDir, id, logPath, pid, startTimestamp: timestamp });
 
-  return { id, pid, logPath: path.relative(projectDir, logPath), timestamp };
+  return {
+    id,
+    pid,
+    logPath: path.relative(projectDir, logPath),
+    timestamp,
+    mode: "headless",
+  };
 }
 
 // ── makeSessionId ────────────────────────────────────────────────────────────

package/bin/scan-data-collector.js

@@ -25,22 +25,50 @@ function parseTestCoverage(text) {
 function parseFilesAndLoc(text) {
   const m = text.match(/\|\s*\*?\*?(?:Grand\s+)?Total[^|]*\*?\*?\s*\|\s*\*?\*?(\d+)\s+files?\*?\*?\s*\|\s*\*?\*?([\d,]+)[^|]*\*?\*?\s*\|/i);
   if (m) return { filesScanned: parseInt(m[1], 10), totalLoc: parseInt(m[2].replace(/,/g, ''), 10) };
+  let files = 0;
+  let loc = 0;
+  const lineRe = /(\d+)\s+files?\s*\(\s*~?\s*([\d,]+)\s+LOC\s*\)/gi;
+  let match;
+  while ((match = lineRe.exec(text)) !== null) {
+    files += parseInt(match[1], 10);
+    loc += parseInt(match[2].replace(/,/g, ''), 10);
+  }
+  if (files > 0) return { filesScanned: files, totalLoc: loc };
   return { filesScanned: 0, totalLoc: 0 };
 }
 
 function parseComponents(text) {
   const sec = text.match(/## Component Inventory([\s\S]*?)(?=\n## |\n---|\n#[^#]|$)/);
-  if (!sec) return [];
-  return sec[1].split('\n')
-    .filter(l => /^\|/.test(l) && !/---/.test(l) && !/Component.*File/i.test(l))
-    .map(row => {
-      const cols = row.split('|').map(c => c.trim().replace(/\*\*/g, '').replace(/`/g, '')).filter(Boolean);
-      if (cols.length < 3) return null;
-      const name = cols[0];
-      if (!name || /^total/i.test(name)) return null;
-      return { name, filePath: cols[1] || '', size: cols[2] || '', purpose: cols[3] || '', files: 1, healthScore: 80 };
-    })
-    .filter(Boolean);
+  if (sec) {
+    const tableRows = sec[1].split('\n')
+      .filter(l => /^\|/.test(l) && !/---/.test(l) && !/Component.*File/i.test(l))
+      .map(row => {
+        const cols = row.split('|').map(c => c.trim().replace(/\*\*/g, '').replace(/`/g, '')).filter(Boolean);
+        if (cols.length < 3) return null;
+        const name = cols[0];
+        if (!name || /^total/i.test(name)) return null;
+        return { name, filePath: cols[1] || '', size: cols[2] || '', purpose: cols[3] || '', files: 1, healthScore: 80 };
+      })
+      .filter(Boolean);
+    if (tableRows.length > 0) return tableRows;
+  }
+  const structSec = text.match(/## Structure([\s\S]*?)(?=\n## |\n---|\n#[^#]|$)/);
+  if (!structSec) return [];
+  const entryRe = /^([a-zA-Z0-9_.\-]+\/)\s+(?:~?\s*)?(?:(\d+)\s+files?\s*)?\(?\s*~?\s*([\d,]+)\s+LOC\s*\)?\s*(.*)$/gm;
+  const out = [];
+  let m;
+  while ((m = entryRe.exec(structSec[1])) !== null) {
+    const name = m[1].replace(/\/$/, '');
+    out.push({
+      name,
+      filePath: m[1],
+      size: (m[2] ? m[2] + ' files, ' : '') + m[3] + ' LOC',
+      purpose: (m[4] || '').trim(),
+      files: m[2] ? parseInt(m[2], 10) : 1,
+      healthScore: 80,
+    });
+  }
+  return out;
 }
 
 function parseSeverityMap(text) {