feat(commit): Integrate DualAgentOrchestrator for commit message generation and improve diff/context handling

2025-12-15 11:36:03 +00:00
parent e500455557
commit 69802b46b6
8 changed files with 159 additions and 17 deletions
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,16 @@
 # Changelog

+## 2025-12-15 - 1.11.0 - feat(commit)
+Integrate DualAgentOrchestrator for commit message generation and improve diff/context handling
+
+- Add @push.rocks/smartagent dependency and export it from plugins
+- Use DualAgentOrchestrator to generate and guardian-validate commit messages
+- Use DualAgentOrchestrator for changelog generation with guardian validation
+- Switch commit flow to TaskContextFactory and DiffProcessor for token-efficient context
+- Expose getOpenaiToken() and wire orchestrator with the project OpenAI token
+- Enhance iterative context builder and context components to better manage token budgets and sampling
+- Update npmextra.json with release config for @git.zone/cli and reference local smartagent package in package.json
+
 ## 2025-12-02 - 1.10.0 - feat(diff-processor)
 Improve diff sampling and file prioritization: increase inclusion thresholds, expand sampled context, and boost priority for interface/type and entry-point files

--- a/npmextra.json
+++ b/npmextra.json
@@ -31,5 +31,14 @@
  },
  "tsdoc": {
    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
+  },
+  "@git.zone/cli": {
+    "release": {
+      "registries": [
+        "https://verdaccio.lossless.digital",
+        "https://registry.npmjs.org"
+      ],
+      "accessLevel": "public"
+    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
    "@push.rocks/early": "^4.0.4",
    "@push.rocks/npmextra": "^5.3.3",
    "@push.rocks/qenv": "^6.1.3",
+    "@push.rocks/smartagent": "file:../../push.rocks/smartagent",
    "@push.rocks/smartai": "^0.8.0",
    "@push.rocks/smartcli": "^4.0.19",
    "@push.rocks/smartdelay": "^3.0.5",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,6 +20,9 @@ importers:
      '@push.rocks/qenv':
        specifier: ^6.1.3
        version: 6.1.3
+      '@push.rocks/smartagent':
+        specifier: file:../../push.rocks/smartagent
+        version: file:../../push.rocks/smartagent(typescript@5.9.3)(ws@8.18.3)(zod@3.25.76)
      '@push.rocks/smartai':
        specifier: ^0.8.0
        version: 0.8.0(typescript@5.9.3)(ws@8.18.3)(zod@3.25.76)
@@ -1155,12 +1158,18 @@ packages:
  '@push.rocks/qenv@6.1.3':
    resolution: {integrity: sha512-+z2hsAU/7CIgpYLFqvda8cn9rUBMHqLdQLjsFfRn5jPoD7dJ5rFlpkbhfM4Ws8mHMniwWaxGKo+q/YBhtzRBLg==}

+  '@push.rocks/smartagent@file:../../push.rocks/smartagent':
+    resolution: {directory: ../../push.rocks/smartagent, type: directory}
+
  '@push.rocks/smartai@0.8.0':
    resolution: {integrity: sha512-guzi28meUDc3mydC8kpoA+4pzExRQqygXYFDD4qQSWPpIRHQ7qhpeNqJzrrGezT1yOH5Gb9taPEGwT56hI+nwQ==}

  '@push.rocks/smartarchive@4.2.2':
    resolution: {integrity: sha512-6EpqbKU32D6Gcqsc9+Tn1dOCU5HoTlrqqs/7IdUr9Tirp9Ngtptkapca1Fw/D0kVJ7SSw3kG/miAYnuPMZLEoA==}

+  '@push.rocks/smartarchive@5.0.1':
+    resolution: {integrity: sha512-x4bie9IIdL9BZqBZLc8Pemp8xZOJGa6mXSVgKJRL4/Rw+E5N4rVHjQOYGRV75nC2mAMJh9GIbixuxLnWjj77ag==}
+
  '@push.rocks/smartarray@1.1.0':
    resolution: {integrity: sha512-b5YgBmUdglOJH8zeUf2ZWdPCoqySgwvkycRi2BhA9zVZHkpASh39Ej0q0fxFJetlUVyYqGfVoMVjbVrLFfFV7g==}

@@ -1198,6 +1207,9 @@ packages:
  '@push.rocks/smartdelay@3.0.5':
    resolution: {integrity: sha512-mUuI7kj2f7ztjpic96FvRIlf2RsKBa5arw81AHNsndbxO6asRcxuWL8dTVxouEIK8YsBUlj0AsrCkHhMbLQdHw==}

+  '@push.rocks/smartdeno@1.2.0':
+    resolution: {integrity: sha512-6S1plCaMUVOZiRSflfoz9Fqk9phACCuKmc7Z6SfTvfl+p9VcPUmewKgaa/0QiLOpiI6ksfxdfmkS5Rw5HpYeIA==}
+
  '@push.rocks/smartdns@7.6.1':
    resolution: {integrity: sha512-nnP5+A2GOt0WsHrYhtKERmjdEHUchc+QbCCBEqlyeQTn+mNfx2WZvKVI1DFRJt8lamvzxP6Hr/BSe3WHdh4Snw==}

@@ -6913,6 +6925,25 @@ snapshots:
      '@push.rocks/smartlog': 3.1.10
      '@push.rocks/smartpath': 6.0.0

+  '@push.rocks/smartagent@file:../../push.rocks/smartagent(typescript@5.9.3)(ws@8.18.3)(zod@3.25.76)':
+    dependencies:
+      '@push.rocks/smartai': 0.8.0(typescript@5.9.3)(ws@8.18.3)(zod@3.25.76)
+      '@push.rocks/smartbrowser': 2.0.8(typescript@5.9.3)
+      '@push.rocks/smartdeno': 1.2.0
+      '@push.rocks/smartfs': 1.2.0
+      '@push.rocks/smartrequest': 5.0.1
+      '@push.rocks/smartshell': 3.3.0
+    transitivePeerDependencies:
+      - aws-crt
+      - bare-abort-controller
+      - bare-buffer
+      - bufferutil
+      - supports-color
+      - typescript
+      - utf-8-validate
+      - ws
+      - zod
+
  '@push.rocks/smartai@0.8.0(typescript@5.9.3)(ws@8.18.3)(zod@3.25.76)':
    dependencies:
      '@anthropic-ai/sdk': 0.65.0(zod@3.25.76)
@@ -6954,6 +6985,24 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

+  '@push.rocks/smartarchive@5.0.1':
+    dependencies:
+      '@push.rocks/smartdelay': 3.0.5
+      '@push.rocks/smartfile': 13.1.0
+      '@push.rocks/smartpath': 6.0.0
+      '@push.rocks/smartpromise': 4.2.3
+      '@push.rocks/smartrequest': 4.4.2
+      '@push.rocks/smartrx': 3.0.10
+      '@push.rocks/smartstream': 3.2.5
+      '@push.rocks/smartunique': 3.0.9
+      '@push.rocks/smarturl': 3.1.0
+      '@types/tar-stream': 3.1.4
+      fflate: 0.8.2
+      file-type: 21.0.0
+      tar-stream: 3.1.7
+    transitivePeerDependencies:
+      - supports-color
+
  '@push.rocks/smartarray@1.1.0': {}

  '@push.rocks/smartbrowser@2.0.8(typescript@5.9.3)':
@@ -7074,6 +7123,16 @@ snapshots:
    dependencies:
      '@push.rocks/smartpromise': 4.2.3

+  '@push.rocks/smartdeno@1.2.0':
+    dependencies:
+      '@push.rocks/smartarchive': 5.0.1
+      '@push.rocks/smartfs': 1.2.0
+      '@push.rocks/smartpath': 6.0.0
+      '@push.rocks/smartshell': 3.3.0
+      '@push.rocks/smartunique': 3.0.9
+    transitivePeerDependencies:
+      - supports-color
+
  '@push.rocks/smartdns@7.6.1':
    dependencies:
      '@push.rocks/smartdelay': 3.0.5
--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@@ -3,6 +3,6 @@
 */
 export const commitinfo = {
  name: '@git.zone/tsdoc',
-  version: '1.10.0',
+  version: '1.11.0',
  description: 'A comprehensive TypeScript documentation tool that leverages AI to generate and enhance project documentation, including dynamic README creation, API docs via TypeDoc, and smart commit message generation.'
 }
--- a/ts/aidocs_classes/commit.ts
+++ b/ts/aidocs_classes/commit.ts
@@ -137,8 +137,30 @@ export class Commit {
      console.log(`The model may not be able to process all information effectively.`);
    }

-    let result = await this.aiDocsRef.openaiInstance.chat({
-      systemMessage: `
+    // Use DualAgentOrchestrator for commit message generation with Guardian validation
+    const commitOrchestrator = new plugins.smartagent.DualAgentOrchestrator({
+      openaiToken: this.aiDocsRef.getOpenaiToken(),
+      defaultProvider: 'openai',
+      guardianPolicyPrompt: `
+You validate commit messages for semantic versioning compliance.
+
+APPROVE if:
+- Version level (fix/feat/BREAKING CHANGE) matches the scope of changes in the diff
+- Commit message is clear, professional, and follows conventional commit conventions
+- No personal information, licensing details, or AI mentions (Claude/Codex) included
+- JSON structure is valid with all required fields
+- Scope accurately reflects the changed modules/files
+
+REJECT with specific feedback if:
+- Version level doesn't match the scope of changes (e.g., "feat" for a typo fix should be "fix")
+- Message is vague, unprofessional, or contains sensitive information
+- JSON is malformed or missing required fields (recommendedNextVersionLevel, recommendedNextVersionScope, recommendedNextVersionMessage, recommendedNextVersionDetails, recommendedNextVersion)
+`,
+    });
+
+    await commitOrchestrator.start();
+
+    const commitTaskPrompt = `
 You create a commit message for a git commit.
 The commit message should be based on the files in the project.
 You should not include any licensing information.
@@ -163,14 +185,20 @@ For the recommendedNextVersionDetails, please only add a detail entries to the a
 You are being given the files of the project. You should use them to create the commit message.
 Also you are given a diff.
 Never mention CLAUDE code, or codex.
-`,
-      messageHistory: [],
-      userMessage: contextString,
-    });

-    // console.log(result.message);
+Project context and diff:
+${contextString}
+`;
+
+    const commitResult = await commitOrchestrator.run(commitTaskPrompt);
+    await commitOrchestrator.stop();
+
+    if (!commitResult.success) {
+      throw new Error(`Commit message generation failed: ${commitResult.status}`);
+    }
+
    const resultObject: INextCommitObject = JSON.parse(
-      result.message.replace('```json', '').replace('```', '')
+      commitResult.result.replace('```json', '').replace('```', '')
    );

    const previousChangelogPath = plugins.path.join(this.projectDir, 'changelog.md');
@@ -183,9 +211,31 @@ Never mention CLAUDE code, or codex.
      // lets build the changelog based on that
      const commitMessages = await gitRepo.getAllCommitMessages();
      console.log(JSON.stringify(commitMessages, null, 2));
-      let result2 = await this.aiDocsRef.openaiInstance.chat({
-        messageHistory: [],
-        systemMessage: `
+
+      // Use DualAgentOrchestrator for changelog generation with Guardian validation
+      const changelogOrchestrator = new plugins.smartagent.DualAgentOrchestrator({
+        openaiToken: this.aiDocsRef.getOpenaiToken(),
+        defaultProvider: 'openai',
+        guardianPolicyPrompt: `
+You validate changelog generation.
+
+APPROVE if:
+- Changelog follows proper markdown format with ## headers for each version
+- Entries are chronologically ordered (newest first)
+- Version ranges for trivial commits are properly summarized
+- No duplicate or empty entries
+- Format matches: ## yyyy-mm-dd - x.x.x - scope
+
+REJECT with feedback if:
+- Markdown formatting is incorrect
+- Entries are not meaningful or helpful
+- Dates or versions are malformed
+`,
+      });
+
+      await changelogOrchestrator.start();
+
+      const changelogTaskPrompt = `
 You are building a changelog.md file for the project.
 Omit commits and versions that lack relevant changes, but make sure to mention them as a range with a summarizing message instead.

@@ -199,17 +249,23 @@ A changelog entry should look like this:
 You are given:
 * the commit messages of the project

-Only return the changelog file, so it can be written directly to changelog.md`,
-        userMessage: `
+Only return the changelog file content, so it can be written directly to changelog.md.
+
 Here are the commit messages:

 ${JSON.stringify(commitMessages, null, 2)}
-  `,
-      });
+`;
+
+      const changelogResult = await changelogOrchestrator.run(changelogTaskPrompt);
+      await changelogOrchestrator.stop();
+
+      if (!changelogResult.success) {
+        throw new Error(`Changelog generation failed: ${changelogResult.status}`);
+      }

      previousChangelog = plugins.smartfileFactory.fromString(
        previousChangelogPath,
-        result2.message.replaceAll('```markdown', '').replaceAll('```', ''),
+        changelogResult.result.replaceAll('```markdown', '').replaceAll('```', ''),
        'utf8'
      );
    }
--- a/ts/classes.aidoc.ts
+++ b/ts/classes.aidoc.ts
@@ -99,6 +99,10 @@ export class AiDoc {
    // They don't keep event loop alive
  }

+  public getOpenaiToken(): string {
+    return this.openaiToken;
+  }
+
  public async buildReadme(projectDirArg: string) {
    const readmeInstance = new aiDocsClasses.Readme(this, projectDirArg);
    return await readmeInstance.build();
--- a/ts/plugins.ts
+++ b/ts/plugins.ts
@@ -6,6 +6,7 @@ export { path };
 // pushrocks scope
 import * as npmextra from '@push.rocks/npmextra';
 import * as qenv from '@push.rocks/qenv';
+import * as smartagent from '@push.rocks/smartagent';
 import * as smartai from '@push.rocks/smartai';
 import * as smartcli from '@push.rocks/smartcli';
 import * as smartdelay from '@push.rocks/smartdelay';
@@ -22,6 +23,7 @@ import * as smarttime from '@push.rocks/smarttime';
 export {
  npmextra,
  qenv,
+  smartagent,
  smartai,
  smartcli,
  smartdelay,