@agjs/tsforge 0.2.1 → 0.2.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agjs/tsforge",
   "type": "module",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "license": "MIT",
   "description": "TypeScript coding harness with a deterministic gate, stack-aware guardrails, and stream-level correction.",
   "repository": {

package/scripts/sweep.ts

@@ -6,7 +6,7 @@
 import { mkdir, readdir, rm, stat } from "node:fs/promises";
 import { join } from "node:path";
 import { parseSpec } from "../src/spec";
-import { buildGate, prettierWriteCommand } from "../src/detect-gate";
+import { buildGate, buildCoreFix } from "../src/detect-gate";
 import { runSpec, qualityRepair } from "../src/loop";
 import { modelAgent } from "../src/agent";
 import { OpenAICompatibleProvider } from "../src/inference";
@@ -258,17 +258,22 @@ async function runOne(
     // (an unguarded index access, an `as any`) slipped through as GREEN. Now
     // every task and the whole-spec verify must clear the strict floor BEFORE
     // its functional tests count.
-    // prettier --write FIRST (auto-format), then tsc-strict + eslint. The model
-    // never hand-formats, but the gate still enforces type-safety + idioms.
-    const strictGate = `${prettierWriteCommand()} && ${(await buildGate(runDir)).command}`;
+    // buildCoreFix (eslint --fix + prettier) runs as task.fix before each gate
+    // check — same janitor as the interactive CLI — so padding-line, prefer-const,
+    // etc. are squashed without model turns.
+    const gateCommand = (await buildGate(runDir)).command;
+    const fixCommand = buildCoreFix();
     const gatedSpec = {
       ...spec,
       tasks: spec.tasks.map((t) => ({
         ...t,
-        accept: `${strictGate} && ${t.accept}`,
+        fix: fixCommand,
+        accept: `${gateCommand} && ${t.accept}`,
       })),
       verify:
-        spec.verify.length > 0 ? `${strictGate} && ${spec.verify}` : strictGate,
+        spec.verify.length > 0
+          ? `${gateCommand} && ${spec.verify}`
+          : gateCommand,
     };
 
     // Every run gets a full transcript at <runDir>/run.log; stream to the

package/src/cli.ts

@@ -38,6 +38,7 @@ import {
   buildGate,
   buildWebGate,
   buildWebFix,
+  buildCoreFix,
   buildWebTypeGate,
   buildWebTscCheck,
   scaffoldWeb,
@@ -903,7 +904,7 @@ async function repl(args: ICliArgs): Promise<number> {
           fix: buildWebFix("react"),
           incrementalCheck: buildWebTscCheck(),
         }
-      : { scaffoldWeb: true }),
+      : { scaffoldWeb: true, fix: buildCoreFix() }),
     ...(thinkingTokenBudget === undefined ? {} : { thinkingTokenBudget }),
     ...(autoCompactAt === undefined ? {} : { autoCompactAt }),
     // Thinking OFF for interactive replies so they STREAM immediately instead of

package/src/detect-gate.ts

@@ -462,6 +462,22 @@ export function buildWebFix(framework: WebFramework): string {
   return `${lintFix} ; ${format}`;
 }
 
+/**
+ * The core (non-web) auto-fix command — same janitor as buildWebFix but uses the
+ * bundled strict.eslint.config.mjs. Run BEFORE the gate each cycle so padding-line,
+ * prefer-const, curly, etc. are squashed without model turns.
+ */
+export function buildCoreFix(): string {
+  const lintFix =
+    `"${ESLINT_BIN}" --no-config-lookup -c "${STRICT_CONFIG}" --fix .`.replace(
+      /\s+/g,
+      " "
+    );
+  const format = `"${PRETTIER_BIN}" --write .`;
+
+  return `${lintFix} ; ${format}`;
+}
+
 async function ensureFile(
   cwd: string,
   name: string,

package/strict.eslint.config.mjs

@@ -12,6 +12,7 @@
 // Rule overrides are loaded via TSFORGE_RULE_OVERRIDES env var (JSON-encoded
 // map of bare rule names to "error" | "warn" | "off").
 import tseslint from "typescript-eslint";
+import stylistic from "@stylistic/eslint-plugin";
 
 // Load stack-aware packs if TSFORGE_PACKS env var is set
 let packConfig = [];
@@ -52,7 +53,10 @@ export default tseslint.config(
   {
     files: ["**/*.ts", "**/*.tsx"],
     languageOptions: { parser: tseslint.parser },
-    plugins: { "@typescript-eslint": tseslint.plugin },
+    plugins: {
+      "@typescript-eslint": tseslint.plugin,
+      "@stylistic": stylistic,
+    },
     rules: {
       // The idioms the model habitually violates — all caught WITHOUT type info.
       "@typescript-eslint/consistent-type-assertions": [
@@ -69,6 +73,25 @@ export default tseslint.config(
       "prefer-const": "error",
       "prefer-template": "error",
       "no-var": "error",
+      // Blank-line discipline — the model rarely gets spacing right, so
+      // eslint --fix + prettier make it free. Uses @stylistic (the rule's
+      // maintained home; the core rule is deprecated and spams usedDeprecatedRules
+      // into eslint's --format json gate output).
+      "@stylistic/padding-line-between-statements": [
+        "error",
+        { blankLine: "always", prev: "import", next: "*" },
+        { blankLine: "any", prev: "import", next: "import" },
+        { blankLine: "always", prev: "*", next: "return" },
+        { blankLine: "always", prev: "*", next: "throw" },
+        { blankLine: "always", prev: ["const", "let", "var"], next: "*" },
+        {
+          blankLine: "any",
+          prev: ["const", "let", "var"],
+          next: ["const", "let", "var"],
+        },
+        { blankLine: "always", prev: "block-like", next: "*" },
+        { blankLine: "always", prev: "*", next: "block-like" },
+      ],
       eqeqeq: ["error", "always"],
       curly: ["error", "all"],
       "no-restricted-syntax": [