@produck/agent-toolkit 0.9.0 → 0.9.2

package/bin/command/sync-coverage/index.mjs

@@ -21,8 +21,13 @@ const TOOLING_BASELINE_CANDIDATE_PATHS = [
 ];
 const GLOB_TOKEN_PATTERN = /[*?{}[\]]/;
 const REQUIRED_ROOT_COVERAGE_SCRIPT_KEY = 'produck:coverage';
-const REQUIRED_ROOT_COVERAGE_SCRIPT_VALUE =
-  'c8 --config .c8rc.json npm run test --workspaces --if-present';
+const REQUIRED_ROOT_COVERAGE_SCRIPT_VALUE = [
+  'c8',
+  '--config .c8rc.json',
+  'npm run test',
+  '--workspaces',
+  '--if-present',
+].join(' ');
 const REQUIRED_COVERAGE_SCRIPT_KEY = 'produck:coverage';
 const REQUIRED_TEST_SCRIPT_KEY = 'test';
 const DEFAULT_TEST_SCRIPT_VALUE =

package/bin/command/sync-git/help.txt

@@ -4,7 +4,7 @@ Usage:
 
 Behavior:
   - Applies organization-required root shared scripts:
-    - scripts.produck:baseline = npm exec --package=@produck/agent-toolkit@latest -- agent-toolkit enforce-node-baseline --cwd .
+    - scripts.produck:baseline = npm exec --package=@produck/agent-toolkit@latest -- agent-toolkit enforce-node-baseline --cwd . && npm run produck:install
     - scripts.produck:commit:check = npm run produck:format && npm run produck:lint
     - scripts.prepare = husky
   - Applies organization-required root shared managed devDependencies:

package/bin/command/sync-git/index.mjs

@@ -29,11 +29,22 @@ const HUSKY_DIR = '.husky';
 const PRE_COMMIT_HOOK_FILE = 'pre-commit';
 const COMMIT_MSG_HOOK_FILE = 'commit-msg';
 const REQUIRED_BASELINE_SCRIPT_KEY = 'produck:baseline';
-const REQUIRED_BASELINE_SCRIPT_VALUE =
-  'npm exec --package=@produck/agent-toolkit@latest -- agent-toolkit enforce-node-baseline --cwd .';
+const REQUIRED_BASELINE_SCRIPT_VALUE = [
+  [
+    'npm exec',
+    '--package=@produck/agent-toolkit@latest',
+    '--',
+    'agent-toolkit',
+    'enforce-node-baseline',
+    '--cwd .',
+  ].join(' '),
+  'npm run produck:install',
+].join(' && ');
 const REQUIRED_COMMIT_CHECK_SCRIPT_KEY = 'produck:commit:check';
-const REQUIRED_COMMIT_CHECK_SCRIPT_VALUE =
-  'npm run produck:format && npm run produck:lint';
+const REQUIRED_COMMIT_CHECK_SCRIPT_VALUE = [
+  'npm run produck:format',
+  'npm run produck:lint',
+].join(' && ');
 const REQUIRED_PREPARE_SCRIPT_KEY = 'prepare';
 const REQUIRED_PREPARE_SCRIPT_VALUE = 'husky';
 

package/bin/command/sync-install/index.mjs

@@ -9,7 +9,7 @@ const COMMAND_DIR = path.dirname(fileURLToPath(import.meta.url));
 const HELP_FILE = path.resolve(COMMAND_DIR, 'help.txt');
 const LEGACY_INSTALL_SCRIPT_KEY = 'deps:install';
 const REQUIRED_INSTALL_SCRIPT_KEY = 'produck:install';
-const REQUIRED_INSTALL_SCRIPT_VALUE = 'npm -v && npm install';
+const REQUIRED_INSTALL_SCRIPT_VALUE = ['npm -v', 'npm install'].join(' && ');
 
 export function printSyncInstallHelp() {
   printTextResource(HELP_FILE);

package/bin/command/sync-lint/eslint.config.template.mjs

@@ -1,8 +1,6 @@
 import js from '@eslint/js';
 import globals from 'globals';
 import tseslint from 'typescript-eslint';
-import json from '@eslint/json';
-import markdown from '@eslint/markdown';
 import { defineConfig } from 'eslint/config';
 import * as ProduckRule from '@produck/eslint-rules';
 
@@ -14,19 +12,8 @@ export default defineConfig([
     languageOptions: { globals: { ...globals.browser, ...globals.node } },
   },
   tseslint.configs.recommended,
-  {
-    files: ['**/*.json'],
-    ignores: ['**/package-lock.json'],
-    plugins: { json },
-    language: 'json/json',
-    extends: ['json/recommended'],
-  },
-  {
-    files: ['**/*.md'],
-    plugins: { markdown },
-    language: 'markdown/gfm',
-    extends: ['markdown/recommended'],
-  },
-  ProduckRule.config,
+  ProduckRule.config.ecma,
+  ProduckRule.config.json,
+  ProduckRule.config.markdown,
   ProduckRule.excludeGitIgnore(import.meta.url),
 ]);

package/bin/command/sync-lint/index.mjs

@@ -21,6 +21,12 @@ const TOOLING_BASELINE_CANDIDATE_PATHS = [
 ];
 const ESLINT_RULES_PACKAGE_NAME = '@produck/eslint-rules';
 const ESLINT_CONFIG_FILE = 'eslint.config.mjs';
+const REQUIRED_ESLINT_ENTRIES = [
+  'ProduckRule.config.ecma',
+  'ProduckRule.config.json',
+  'ProduckRule.config.markdown',
+  'ProduckRule.excludeGitIgnore(import.meta.url)',
+];
 
 const REQUIRED_LINT_SCRIPT_KEY = 'produck:lint';
 const REQUIRED_LINT_SCRIPT_VALUE = 'eslint --fix . --max-warnings=0';
@@ -54,16 +60,27 @@ function readFileIfExists(filePath) {
   return fs.readFileSync(filePath, 'utf8');
 }
 
-function getRequiredEslintRulesDevDependency() {
-  // Prefer the in-tree source of truth: when sync-lint runs from inside the
-  // monorepo, the eslint-rules package.json is the authoritative version. When
-  // sync-lint runs as an installed dependency, fall back to the publish-assets
-  // tooling baseline (which build-publish-assets injects at prepack time from
-  // the same package.json).
+const ESLINT_TOOLING_PACKAGE_NAMES = [
+  'eslint',
+  '@eslint/js',
+  '@eslint/json',
+  '@eslint/markdown',
+  '@eslint/config-helpers',
+  'typescript-eslint',
+  'globals',
+];
+
+function getRequiredEslintDevDependencies() {
+  // Prefer the in-tree source of truth for @produck/eslint-rules: when
+  // sync-lint runs inside the monorepo, eslint-rules/package.json is
+  // authoritative. When running as an installed dependency, fall back to the
+  // publish-assets tooling baseline.
   const inTreeEslintRulesPkgPath = path.resolve(
     REPO_ROOT,
     'packages/eslint-rules/package.json',
   );
+
+  let eslintRulesVersion = '';
   if (fs.existsSync(inTreeEslintRulesPkgPath)) {
     const eslintRulesPkg = parseJsonFile(
       inTreeEslintRulesPkgPath,
@@ -71,13 +88,13 @@ function getRequiredEslintRulesDevDependency() {
     );
     // The '' fallback is for when the in-tree package.json has a non-string
     // version field, which never occurs for this package.
-    const version =
+    const v =
       typeof eslintRulesPkg.version === 'string'
         ? eslintRulesPkg.version.trim()
         : /* c8 ignore next */
         '';
-    if (version) {
-      return version;
+    if (v) {
+      eslintRulesVersion = v;
     }
   }
 
@@ -87,9 +104,9 @@ function getRequiredEslintRulesDevDependency() {
     },
   );
 
+  /* c8 ignore next 7 */
   if (!toolingBaselinePath) {
-    console.error('Cannot resolve @produck/eslint-rules version. Looked at:');
-    console.error(`- ${inTreeEslintRulesPkgPath}`);
+    console.error('Cannot resolve ESLint tooling versions. Looked at:');
     for (const candidatePath of TOOLING_BASELINE_CANDIDATE_PATHS) {
       console.error(`- ${candidatePath}`);
     }
@@ -97,21 +114,40 @@ function getRequiredEslintRulesDevDependency() {
   }
 
   const baseline = parseJsonFile(toolingBaselinePath, 'Tooling baseline file');
-  const entry = baseline?.tools?.[ESLINT_RULES_PACKAGE_NAME];
-  // The '' fallback is for when the tooling baseline lacks a string version entry
-  // for the eslint-rules package, which the repository always provides.
-  /* c8 ignore next 2 */
-  const version =
-    typeof entry?.version === 'string' ? entry.version.trim() : '';
-
-  if (!version) {
-    console.error(
-      `Tooling baseline tools["${ESLINT_RULES_PACKAGE_NAME}"].version must be a non-empty string: ${toolingBaselinePath}`,
-    );
-    process.exit(2);
+
+  /* c8 ignore next 12 */
+  if (!eslintRulesVersion) {
+    const entry = baseline?.tools?.[ESLINT_RULES_PACKAGE_NAME];
+    const v = typeof entry?.version === 'string' ? entry.version.trim() : '';
+    if (!v) {
+      console.error(
+        `Tooling baseline tools["${ESLINT_RULES_PACKAGE_NAME}"].version must be a non-empty string: ${toolingBaselinePath}`,
+      );
+      process.exit(2);
+    }
+    eslintRulesVersion = v;
   }
 
-  return version;
+  const deps = { [ESLINT_RULES_PACKAGE_NAME]: eslintRulesVersion };
+
+  for (const name of ESLINT_TOOLING_PACKAGE_NAMES) {
+    const entry = baseline?.tools?.[name];
+    const v =
+      typeof entry?.version === 'string'
+        ? entry.version.trim()
+        : /* c8 ignore next */
+        '';
+    /* c8 ignore next 6 */
+    if (!v) {
+      console.error(
+        `Tooling baseline tools["${name}"].version must be a non-empty string: ${toolingBaselinePath}`,
+      );
+      process.exit(2);
+    }
+    deps[name] = v;
+  }
+
+  return deps;
 }
 
 function patchEslintConfig(existing) {
@@ -139,7 +175,7 @@ function patchEslintConfig(existing) {
   }
 
   output =
-    `${output.slice(0, exportEnd)}  ProduckRule.config,\n  ProduckRule.excludeGitIgnore(import.meta.url),\n` +
+    `${output.slice(0, exportEnd)}  ProduckRule.config.ecma,\n  ProduckRule.config.json,\n  ProduckRule.config.markdown,\n  ProduckRule.excludeGitIgnore(import.meta.url),\n` +
     output.slice(exportEnd);
 
   if (!output.endsWith('\n')) {
@@ -186,19 +222,15 @@ export function runSyncLint(options) {
     typeof scripts[REQUIRED_LINT_SCRIPT_KEY] === 'string'
       ? scripts[REQUIRED_LINT_SCRIPT_KEY]
       : null;
-  const previousEslintRules =
-    typeof devDependencies['@produck/eslint-rules'] === 'string'
-      ? devDependencies['@produck/eslint-rules']
-      : null;
-
-  const requiredEslintRulesDependency = getRequiredEslintRulesDevDependency();
+  const requiredEslintDevDeps = getRequiredEslintDevDependencies();
 
   const eslintConfigPath = path.resolve(cwd, ESLINT_CONFIG_FILE);
   const previousEslintConfig = readFileIfExists(eslintConfigPath);
 
   const matchesRequiredLint = previousLint === REQUIRED_LINT_SCRIPT_VALUE;
-  const matchesRequiredEslintRules =
-    previousEslintRules === requiredEslintRulesDependency;
+  const matchesRequiredEslintDeps = Object.entries(requiredEslintDevDeps).every(
+    ([name, version]) => devDependencies[name] === version,
+  );
 
   let eslintConfigAction = 'unchanged';
   let matchesRequiredEslintConfig = false;
@@ -209,8 +241,14 @@ export function runSyncLint(options) {
     nextEslintConfigText = REQUIRED_ESLINT_CONFIG;
   } else if (previousEslintConfig === REQUIRED_ESLINT_CONFIG) {
     matchesRequiredEslintConfig = true;
-  } else if (previousEslintConfig.includes('@produck/eslint-rules')) {
+  } else if (
+    previousEslintConfig.includes(ESLINT_RULES_PACKAGE_NAME) &&
+    REQUIRED_ESLINT_ENTRIES.every((e) => previousEslintConfig.includes(e))
+  ) {
     matchesRequiredEslintConfig = true;
+  } else if (previousEslintConfig.includes(ESLINT_RULES_PACKAGE_NAME)) {
+    eslintConfigAction = 'replaced';
+    nextEslintConfigText = REQUIRED_ESLINT_CONFIG;
   } else {
     const patched = patchEslintConfig(previousEslintConfig);
     if (patched.ok) {
@@ -223,7 +261,7 @@ export function runSyncLint(options) {
 
   const requiresUpdate =
     !matchesRequiredLint ||
-    !matchesRequiredEslintRules ||
+    !matchesRequiredEslintDeps ||
     !matchesRequiredEslintConfig;
   const hasUnpatchableEslintConfig = eslintConfigAction === 'unpatchable';
 
@@ -231,7 +269,9 @@ export function runSyncLint(options) {
     scripts[REQUIRED_LINT_SCRIPT_KEY] = REQUIRED_LINT_SCRIPT_VALUE;
     pkg.scripts = scripts;
 
-    devDependencies['@produck/eslint-rules'] = requiredEslintRulesDependency;
+    for (const [name, version] of Object.entries(requiredEslintDevDeps)) {
+      devDependencies[name] = version;
+    }
     pkg.devDependencies = devDependencies;
 
     fs.writeFileSync(
@@ -257,22 +297,22 @@ export function runSyncLint(options) {
     required: {
       lintScriptKey: REQUIRED_LINT_SCRIPT_KEY,
       lintScriptValue: REQUIRED_LINT_SCRIPT_VALUE,
-      eslintRulesVersion: requiredEslintRulesDependency,
+      eslintDevDependencies: requiredEslintDevDeps,
       eslintConfigPath: path.relative(cwd, eslintConfigPath),
       eslintConfigAction,
     },
     status: {
       matchesRequiredLintBefore: matchesRequiredLint,
-      matchesRequiredEslintRulesBefore: matchesRequiredEslintRules,
+      matchesRequiredEslintDepsBefore: matchesRequiredEslintDeps,
       matchesRequiredEslintConfigBefore: matchesRequiredEslintConfig,
       matchesRequiredLintAfter:
         requiresUpdate && mode === 'sync' && !hasUnpatchableEslintConfig
           ? true
           : matchesRequiredLint,
-      matchesRequiredEslintRulesAfter:
+      matchesRequiredEslintDepsAfter:
         requiresUpdate && mode === 'sync' && !hasUnpatchableEslintConfig
           ? true
-          : matchesRequiredEslintRules,
+          : matchesRequiredEslintDeps,
       matchesRequiredEslintConfigAfter:
         requiresUpdate && mode === 'sync' && !hasUnpatchableEslintConfig
           ? true

package/bin/command/sync-publish/index.mjs

@@ -16,11 +16,16 @@ const LERNA_TEMPLATE_CANDIDATE_PATHS = [
 ];
 
 const REQUIRED_PUBLISH_CHECK_SCRIPT_KEY = 'produck:publish:check';
-const REQUIRED_PUBLISH_CHECK_SCRIPT_VALUE =
-  'npm run produck:install && npm run produck:coverage && npm run produck:commit:check';
+const REQUIRED_PUBLISH_CHECK_SCRIPT_VALUE = [
+  'npm run produck:install',
+  'npm run produck:coverage',
+  'npm run produck:commit:check',
+].join(' && ');
 const REQUIRED_PUBLISH_SCRIPT_KEY = 'produck:publish';
-const REQUIRED_PUBLISH_SCRIPT_VALUE =
-  'npm run produck:publish:check && npm run publish --';
+const REQUIRED_PUBLISH_SCRIPT_VALUE = [
+  'npm run produck:publish:check',
+  'npm run publish --',
+].join(' && ');
 const REQUIRED_LERNA_VERSION_COMMIT_HOOKS = false;
 
 export function printSyncPublishHelp() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@produck/agent-toolkit",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Central CLI toolkit for organization AI execution workflows",
   "type": "module",
   "repository": {
@@ -29,8 +29,8 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@produck/eslint-rules": "^0.3.6",
+    "@produck/eslint-rules": "^0.4.0",
     "c8": "11.0.0"
   },
-  "gitHead": "d13162976bfbf23756e678027aaffe464b7c8177"
+  "gitHead": "aa9500630476fb423720f0b0056096e0e87e4c21"
 }

package/publish-assets/eslint.config.template.mjs

@@ -1,8 +1,6 @@
 import js from '@eslint/js';
 import globals from 'globals';
 import tseslint from 'typescript-eslint';
-import json from '@eslint/json';
-import markdown from '@eslint/markdown';
 import { defineConfig } from 'eslint/config';
 import * as ProduckRule from '@produck/eslint-rules';
 
@@ -14,19 +12,8 @@ export default defineConfig([
     languageOptions: { globals: { ...globals.browser, ...globals.node } },
   },
   tseslint.configs.recommended,
-  {
-    files: ['**/*.json'],
-    ignores: ['**/package-lock.json'],
-    plugins: { json },
-    language: 'json/json',
-    extends: ['json/recommended'],
-  },
-  {
-    files: ['**/*.md'],
-    plugins: { markdown },
-    language: 'markdown/gfm',
-    extends: ['markdown/recommended'],
-  },
-  ProduckRule.config,
+  ProduckRule.config.ecma,
+  ProduckRule.config.json,
+  ProduckRule.config.markdown,
   ProduckRule.excludeGitIgnore(import.meta.url),
 ]);

package/publish-assets/instructions/produck/tooling-version-baseline.json

@@ -58,7 +58,7 @@
       "allowLatest": false
     },
     "@produck/eslint-rules": {
-      "version": "0.3.6",
+      "version": "0.4.0",
       "policy": "pinned",
       "allowLatest": false
     }