@produck/agent-toolkit 0.8.1 → 0.9.0

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

@@ -7,23 +7,21 @@ import { printTextResource } from '../shared/text-resource.mjs';
 
 const COMMAND_DIR = path.dirname(fileURLToPath(import.meta.url));
 const HELP_FILE = path.resolve(COMMAND_DIR, 'help.txt');
+const PACKAGE_ROOT = path.resolve(COMMAND_DIR, '../../..');
+const REPO_ROOT = path.resolve(PACKAGE_ROOT, '../..');
 const LERNA_CONFIG_FILE = 'lerna.json';
+const LERNA_TEMPLATE_CANDIDATE_PATHS = [
+  path.resolve(REPO_ROOT, LERNA_CONFIG_FILE),
+  path.resolve(PACKAGE_ROOT, 'publish-assets', LERNA_CONFIG_FILE),
+];
 
 const REQUIRED_PUBLISH_CHECK_SCRIPT_KEY = 'produck:publish:check';
 const REQUIRED_PUBLISH_CHECK_SCRIPT_VALUE =
-  'npm run produck:install && npm run produck:format && npm run produck:lint && npm run produck:coverage';
-const USER_PUBLISH_SCRIPT_KEY = 'publish';
+  'npm run produck:install && npm run produck:coverage && npm run produck:commit:check';
 const REQUIRED_PUBLISH_SCRIPT_KEY = 'produck:publish';
-const REQUIRED_PUBLISH_SCRIPT_FALLBACK_VALUE = 'npm run produck:publish:check && lerna publish';
-
-const REQUIRED_LERNA_DEFAULT_CONFIG = `${JSON.stringify(
-  {
-    $schema: 'node_modules/lerna/schemas/lerna-schema.json',
-    version: 'independent',
-  },
-  null,
-  2,
-)}\n`;
+const REQUIRED_PUBLISH_SCRIPT_VALUE =
+  'npm run produck:publish:check && npm run publish --';
+const REQUIRED_LERNA_VERSION_COMMIT_HOOKS = false;
 
 export function printSyncPublishHelp() {
   printTextResource(HELP_FILE);
@@ -38,12 +36,51 @@ function parseJsonFile(filePath, label) {
   }
 }
 
-function buildRequiredPublishScriptValue(hasUserPublishScript) {
-  if (hasUserPublishScript) {
-    return 'npm run produck:publish:check && npm run publish --';
+function loadRequiredLernaTemplate() {
+  const templatePath = LERNA_TEMPLATE_CANDIDATE_PATHS.find((candidatePath) => {
+    return fs.existsSync(candidatePath);
+  });
+
+  if (!templatePath) {
+    console.error('lerna template does not exist in expected locations:');
+    for (const candidatePath of LERNA_TEMPLATE_CANDIDATE_PATHS) {
+      console.error(`- ${candidatePath}`);
+    }
+    process.exit(2);
+  }
+
+  const template = parseJsonFile(templatePath, 'lerna template');
+  if (typeof template.version !== 'string') {
+    console.error(
+      `lerna template must have a "version" field: ${templatePath}`,
+    );
+    process.exit(2);
   }
 
-  return REQUIRED_PUBLISH_SCRIPT_FALLBACK_VALUE;
+  // The {} fallbacks below guard against templates that omit 'command' or
+  // 'command.version'; the canonical lerna template always provides both.
+  const normalizedTemplate = {
+    ...template,
+    command: {
+      ...(template.command && typeof template.command === 'object'
+        ? template.command
+        : /* c8 ignore next */
+        {}),
+      version: {
+        ...(template?.command?.version &&
+        typeof template.command.version === 'object'
+          ? template.command.version
+          : /* c8 ignore next */
+          {}),
+        commitHooks: REQUIRED_LERNA_VERSION_COMMIT_HOOKS,
+      },
+    },
+  };
+
+  return {
+    templatePath,
+    content: `${JSON.stringify(normalizedTemplate, null, 2)}\n`,
+  };
 }
 
 export function runSyncPublish(options) {
@@ -52,6 +89,7 @@ export function runSyncPublish(options) {
   const dryRun = hasFlag(options, '--dry-run') && !check;
   const jsonFile = getSingle(options, '--json', '');
   const mode = check ? 'check' : dryRun ? 'dry-run' : 'sync';
+  const requiredLernaTemplate = loadRequiredLernaTemplate();
 
   if (!fs.existsSync(cwd)) {
     console.error(`CWD does not exist: ${cwd}`);
@@ -61,19 +99,53 @@ export function runSyncPublish(options) {
   const lernaConfigPath = path.resolve(cwd, LERNA_CONFIG_FILE);
   const lernaExistedBefore = fs.existsSync(lernaConfigPath);
   let lernaDefaultCreated = false;
+  let matchesRequiredLernaCommitHooks = false;
+  let matchesRequiredLernaCommitHooksBefore = false;
 
   if (!lernaExistedBefore) {
     if (mode === 'sync') {
-      fs.writeFileSync(lernaConfigPath, REQUIRED_LERNA_DEFAULT_CONFIG, 'utf8');
+      fs.writeFileSync(lernaConfigPath, requiredLernaTemplate.content, 'utf8');
       lernaDefaultCreated = true;
+      matchesRequiredLernaCommitHooks = true;
     }
   } else {
     const lernaConfig = parseJsonFile(lernaConfigPath, 'lerna.json');
 
     if (typeof lernaConfig.version !== 'string') {
-      console.error(`lerna.json must have a "version" field: ${lernaConfigPath}`);
+      console.error(
+        `lerna.json must have a "version" field: ${lernaConfigPath}`,
+      );
       process.exit(2);
     }
+
+    const currentCommitHooks = lernaConfig?.command?.version?.commitHooks;
+    matchesRequiredLernaCommitHooks =
+      currentCommitHooks === REQUIRED_LERNA_VERSION_COMMIT_HOOKS;
+    matchesRequiredLernaCommitHooksBefore = matchesRequiredLernaCommitHooks;
+
+    if (mode === 'sync' && !matchesRequiredLernaCommitHooks) {
+      const nextLernaConfig = {
+        ...lernaConfig,
+        command: {
+          ...(lernaConfig.command && typeof lernaConfig.command === 'object'
+            ? lernaConfig.command
+            : {}),
+          version: {
+            ...(lernaConfig?.command?.version &&
+            typeof lernaConfig.command.version === 'object'
+              ? lernaConfig.command.version
+              : {}),
+            commitHooks: REQUIRED_LERNA_VERSION_COMMIT_HOOKS,
+          },
+        },
+      };
+      fs.writeFileSync(
+        lernaConfigPath,
+        `${JSON.stringify(nextLernaConfig, null, 2)}\n`,
+        'utf8',
+      );
+      matchesRequiredLernaCommitHooks = true;
+    }
   }
 
   const rootPackageJsonPath = path.resolve(cwd, 'package.json');
@@ -84,13 +156,11 @@ export function runSyncPublish(options) {
 
   const pkg = parseJsonFile(rootPackageJsonPath, 'Root package.json');
   const scripts =
-    pkg.scripts && typeof pkg.scripts === 'object' && !Array.isArray(pkg.scripts)
+    pkg.scripts &&
+    typeof pkg.scripts === 'object' &&
+    !Array.isArray(pkg.scripts)
       ? { ...pkg.scripts }
       : {};
-  const hasUserPublishScript =
-    typeof scripts[USER_PUBLISH_SCRIPT_KEY] === 'string' &&
-    scripts[USER_PUBLISH_SCRIPT_KEY].trim() !== '';
-  const requiredPublishScriptValue = buildRequiredPublishScriptValue(hasUserPublishScript);
 
   const previousPublishCheck =
     typeof scripts[REQUIRED_PUBLISH_CHECK_SCRIPT_KEY] === 'string'
@@ -101,17 +171,30 @@ export function runSyncPublish(options) {
       ? scripts[REQUIRED_PUBLISH_SCRIPT_KEY]
       : null;
 
-  const matchesRequiredPublishCheck = previousPublishCheck === REQUIRED_PUBLISH_CHECK_SCRIPT_VALUE;
-  const matchesRequiredPublish = previousPublish === requiredPublishScriptValue;
+  const matchesRequiredPublishCheck =
+    previousPublishCheck === REQUIRED_PUBLISH_CHECK_SCRIPT_VALUE;
+  const matchesRequiredPublish =
+    previousPublish === REQUIRED_PUBLISH_SCRIPT_VALUE;
   const lernaRequiresCreation = !lernaExistedBefore && !lernaDefaultCreated;
   const requiresUpdate =
-    !matchesRequiredPublishCheck || !matchesRequiredPublish || lernaRequiresCreation;
-
-  if (mode === 'sync' && (!matchesRequiredPublishCheck || !matchesRequiredPublish)) {
-    scripts[REQUIRED_PUBLISH_CHECK_SCRIPT_KEY] = REQUIRED_PUBLISH_CHECK_SCRIPT_VALUE;
-    scripts[REQUIRED_PUBLISH_SCRIPT_KEY] = requiredPublishScriptValue;
+    !matchesRequiredPublishCheck ||
+    !matchesRequiredPublish ||
+    lernaRequiresCreation ||
+    !matchesRequiredLernaCommitHooks;
+
+  if (
+    mode === 'sync' &&
+    (!matchesRequiredPublishCheck || !matchesRequiredPublish)
+  ) {
+    scripts[REQUIRED_PUBLISH_CHECK_SCRIPT_KEY] =
+      REQUIRED_PUBLISH_CHECK_SCRIPT_VALUE;
+    scripts[REQUIRED_PUBLISH_SCRIPT_KEY] = REQUIRED_PUBLISH_SCRIPT_VALUE;
     pkg.scripts = scripts;
-    fs.writeFileSync(rootPackageJsonPath, `${JSON.stringify(pkg, null, 2)}\n`, 'utf8');
+    fs.writeFileSync(
+      rootPackageJsonPath,
+      `${JSON.stringify(pkg, null, 2)}\n`,
+      'utf8',
+    );
   }
 
   const report = {
@@ -121,21 +204,29 @@ export function runSyncPublish(options) {
     lernaConfigPath,
     rootPackageJsonPath,
     required: {
+      lernaTemplatePath: requiredLernaTemplate.templatePath,
       publishCheckScriptKey: REQUIRED_PUBLISH_CHECK_SCRIPT_KEY,
       publishCheckScriptValue: REQUIRED_PUBLISH_CHECK_SCRIPT_VALUE,
       publishScriptKey: REQUIRED_PUBLISH_SCRIPT_KEY,
-      publishScriptValue: requiredPublishScriptValue,
+      publishScriptValue: REQUIRED_PUBLISH_SCRIPT_VALUE,
+      lernaVersionCommitHooks: REQUIRED_LERNA_VERSION_COMMIT_HOOKS,
     },
     status: {
-      hasUserPublishScript,
       lernaExistedBefore,
       lernaDefaultCreated,
+      matchesRequiredLernaCommitHooksBefore:
+        matchesRequiredLernaCommitHooksBefore,
+      matchesRequiredLernaCommitHooksAfter: matchesRequiredLernaCommitHooks,
       matchesRequiredPublishCheckBefore: matchesRequiredPublishCheck,
       matchesRequiredPublishCheckAfter:
-        !matchesRequiredPublishCheck && mode === 'sync' ? true : matchesRequiredPublishCheck,
+        !matchesRequiredPublishCheck && mode === 'sync'
+          ? true
+          : matchesRequiredPublishCheck,
       matchesRequiredPublishBefore: matchesRequiredPublish,
       matchesRequiredPublishAfter:
-        !matchesRequiredPublish && mode === 'sync' ? true : matchesRequiredPublish,
+        !matchesRequiredPublish && mode === 'sync'
+          ? true
+          : matchesRequiredPublish,
       updated: requiresUpdate && mode === 'sync',
     },
   };

package/bin/command/validate-commit-msg/index.mjs

@@ -5,12 +5,31 @@ import { fileURLToPath } from 'node:url';
 import { getSingle } from '../shared/args.mjs';
 import { printTextResource } from '../shared/text-resource.mjs';
 
-const ALLOWED_TAGS = ['INIT', 'ADD', 'REMOVE', 'FIX', 'REFACTOR', 'UPGRADE', 'PUBLISH'];
-const ALLOWED_TARGETS = ['docs', 'test', 'ci', 'deps', 'api', 'schema', 'infra', 'fmt'];
+const ALLOWED_TAGS = [
+  'INIT',
+  'ADD',
+  'REMOVE',
+  'FIX',
+  'REFACTOR',
+  'UPGRADE',
+  'PUBLISH',
+];
+const ALLOWED_TARGETS = [
+  'docs',
+  'test',
+  'ci',
+  'deps',
+  'api',
+  'schema',
+  'infra',
+  'fmt',
+];
 const SECTION_HEADER_RE = /^(?:\*|(?:@[\w.-]+\/)?[\w.-]+):$/;
 const COMMAND_DIR = path.dirname(fileURLToPath(import.meta.url));
 const HELP_FILE = path.resolve(COMMAND_DIR, 'help.txt');
-const ROOT_PACKAGE_FILE = path.resolve(COMMAND_DIR, '../../../../../package.json');
+const ROOT_PACKAGE_FILE =
+  process.env._AGENT_TOOLKIT_TEST_ROOT_PKG ||
+  path.resolve(COMMAND_DIR, '../../../../../package.json');
 const WORKSPACE_SCOPE = 'workspace';
 const WILDCARD_SCOPE = '*';
 const DEFAULT_COMMENT_CHAR = '#';
@@ -65,42 +84,38 @@ function isMonorepoRoot() {
 
   try {
     const rootPackage = JSON.parse(fs.readFileSync(ROOT_PACKAGE_FILE, 'utf8'));
-    return Array.isArray(rootPackage.workspaces) && rootPackage.workspaces.length > 0;
+    return (
+      Array.isArray(rootPackage.workspaces) && rootPackage.workspaces.length > 0
+    );
   } catch {
     return false;
   }
 }
 
 function getMonorepoAllowedSectionScopes() {
-  if (!fs.existsSync(ROOT_PACKAGE_FILE)) {
-    return null;
-  }
-
-  let rootPackage;
-  try {
-    rootPackage = JSON.parse(fs.readFileSync(ROOT_PACKAGE_FILE, 'utf8'));
-  } catch {
-    return null;
-  }
-
-  if (!Array.isArray(rootPackage.workspaces) || rootPackage.workspaces.length === 0) {
-    return null;
-  }
-
+  const rootPackage = JSON.parse(fs.readFileSync(ROOT_PACKAGE_FILE, 'utf8'));
   const rootDir = path.dirname(ROOT_PACKAGE_FILE);
   const allowedScopes = new Set([WORKSPACE_SCOPE, WILDCARD_SCOPE]);
 
   for (const workspaceEntry of rootPackage.workspaces) {
     const workspacePath = path.resolve(rootDir, String(workspaceEntry));
-    const workspacePackageJsonPath = path.resolve(workspacePath, 'package.json');
+    const workspacePackageJsonPath = path.resolve(
+      workspacePath,
+      'package.json',
+    );
 
     if (!fs.existsSync(workspacePackageJsonPath)) {
       continue;
     }
 
     try {
-      const workspacePackage = JSON.parse(fs.readFileSync(workspacePackageJsonPath, 'utf8'));
-      if (typeof workspacePackage.name === 'string' && workspacePackage.name.trim() !== '') {
+      const workspacePackage = JSON.parse(
+        fs.readFileSync(workspacePackageJsonPath, 'utf8'),
+      );
+      if (
+        typeof workspacePackage.name === 'string' &&
+        workspacePackage.name.trim() !== ''
+      ) {
         allowedScopes.add(workspacePackage.name.trim());
       }
     } catch {
@@ -220,7 +235,9 @@ export function runValidateCommitMsg(options) {
   }
 
   const mustUseSectionHeaders = isMonorepoRoot();
-  const allowedSectionScopes = mustUseSectionHeaders ? getMonorepoAllowedSectionScopes() : null;
+  const allowedSectionScopes = mustUseSectionHeaders
+    ? getMonorepoAllowedSectionScopes()
+    : null;
   const hasSectionHeaders = lines.some((line) => isSectionHeaderLine(line));
 
   // [PUBLISH] is generated by lerna and is always a repo-wide tag.
@@ -235,11 +252,15 @@ export function runValidateCommitMsg(options) {
 
   if (mustUseSectionHeaders && !hasSectionHeaders) {
     console.error('Commit message validation failed:');
-    console.error('- Line 1: section header is required before tagged lines in monorepo mode');
+    console.error(
+      '- Line 1: section header is required before tagged lines in monorepo mode',
+    );
     process.exit(1);
   }
 
-  const errors = hasSectionHeaders ? validateSectionFormat(lines, allowedSectionScopes) : [];
+  const errors = hasSectionHeaders
+    ? validateSectionFormat(lines, allowedSectionScopes)
+    : [];
   if (!hasSectionHeaders) {
     for (let i = 0; i < lines.length; i += 1) {
       const err = validateCommitLine(lines[i], i + 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@produck/agent-toolkit",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Central CLI toolkit for organization AI execution workflows",
   "type": "module",
   "repository": {
@@ -14,7 +14,8 @@
   "scripts": {
     "prepack": "node ./bin/build-publish-assets.mjs",
     "test": "node test/index.mjs",
-    "produck:coverage": "c8 --reporter=lcov --reporter=html --reporter=text-summary npm test"
+    "produck:coverage": "c8 --reporter=lcov --reporter=html --reporter=text-summary npm test",
+    "produck:lint": "eslint --fix . --max-warnings=0"
   },
   "files": [
     "bin",
@@ -28,7 +29,8 @@
   },
   "license": "MIT",
   "devDependencies": {
+    "@produck/eslint-rules": "^0.3.6",
     "c8": "11.0.0"
   },
-  "gitHead": "86c4556d03847ded3d7876777e778cc16a800775"
+  "gitHead": "d13162976bfbf23756e678027aaffe464b7c8177"
 }

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

@@ -0,0 +1,32 @@
+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';
+
+export default defineConfig([
+  {
+    files: ['**/*.{js,mjs,cjs,ts,mts,cts}'],
+    plugins: { js },
+    extends: ['js/recommended'],
+    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.excludeGitIgnore(import.meta.url),
+]);

package/publish-assets/gitignore

@@ -135,3 +135,6 @@ dist
 # Specific ignored / generated.
 *.ign*
 *.gen*
+
+# @produck/agent-toolkit
+publish-assets/

package/publish-assets/instructions/produck/20-produck-commit.instructions.md

@@ -40,7 +40,7 @@ Monorepo format (required for multi-package repositories):
 
 Example monorepo format:
 
-```
+```text
 foo:
 [FIX] race condition in auth handler
 [ADD] <test>: cover edge case for concurrent login
@@ -121,14 +121,14 @@ integration test)`
 
 Monorepo examples:
 
-```
+```text
 foo:
 [FIX] a
 [FIX] b
 [FIX] c
 ```
 
-```
+```text
 core:
 [ADD] <api>: new user authentication endpoint
 [REFACTOR] <test>: restructure session management tests

package/publish-assets/instructions/produck/stale.instructions.md

@@ -0,0 +1 @@
+user owned content

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

@@ -22,8 +22,43 @@
       "policy": "pinned",
       "allowLatest": false
     },
+    "eslint": {
+      "version": "10.4.0",
+      "policy": "pinned",
+      "allowLatest": false
+    },
+    "@eslint/js": {
+      "version": "10.0.1",
+      "policy": "pinned",
+      "allowLatest": false
+    },
+    "@eslint/json": {
+      "version": "1.2.0",
+      "policy": "pinned",
+      "allowLatest": false
+    },
+    "@eslint/markdown": {
+      "version": "8.0.1",
+      "policy": "pinned",
+      "allowLatest": false
+    },
+    "@eslint/config-helpers": {
+      "version": "0.6.0",
+      "policy": "pinned",
+      "allowLatest": false
+    },
+    "typescript-eslint": {
+      "version": "8.59.4",
+      "policy": "pinned",
+      "allowLatest": false
+    },
+    "globals": {
+      "version": "17.6.0",
+      "policy": "pinned",
+      "allowLatest": false
+    },
     "@produck/eslint-rules": {
-      "version": "0.3.5",
+      "version": "0.3.6",
       "policy": "pinned",
       "allowLatest": false
     }

package/publish-assets/lerna.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "./node_modules/lerna/schemas/lerna-schema.json",
+  "command": {
+    "version": {
+      "commitHooks": false
+    },
+    "publish": {
+      "ignoreScripts": false,
+      "message": "[PUBLISH]"
+    }
+  },
+  "useNx": false,
+  "version": "independent"
+}

package/publish-assets/prettierrc

@@ -0,0 +1,11 @@
+{
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "useTabs": false,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "arrowParens": "always",
+  "printWidth": 80,
+  "endOfLine": "lf"
+}