Skip to content

fix(conductor): ensure track completion and doc sync are committed automatically #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
moisgobg merged 3 commits into from
Jan 5, 2026
Merged

fix(conductor): ensure track completion and doc sync are committed automatically #48

moisgobg merged 3 commits into from
Jan 5, 2026

Conversation

@moisgobg
Copy link
Contributor

@moisgobg moisgobg commented Jan 3, 2026 •
edited
Loading

This adds explicit commit steps to the implement command for:

  • Track completion status updates in tracks.md
  • Project documentation synchronization
  • Track cleanup (archiving or deleting)

Fixes #16
Testing: test_scenarios.md

@moisgobg
fix(conductor): ensure track completion and doc sync are committed au…
e3630ac 
…tomatically

This adds explicit commit steps to the implement command for:
- Track completion status updates in tracks.md
- Project documentation synchronization
- Track cleanup (archiving or deleting)

BUG=16
@moisgobg moisgobg requested a review from sherzat3 January 3, 2026 01:02
@moisgobg moisgobg self-assigned this Jan 3, 2026
sherzat3
sherzat3 requested changes Jan 5, 2026
View reviewed changes
commands/conductor/implement.toml Outdated
5. **Finalize Track:**
- After all tasks in the track's local `plan.md` are completed, you MUST update the track's status in the tracks file.
- This requires finding the specific heading for the track (e.g., `## [~] Track: <Description>`) and replacing it with the completed status (e.g., `## [x] Track: <Description>`).
- **Commit Changes:** Stage `conductor/tracks.md` and commit with the message `conductor(track): Mark track '<track_description>' as complete`.
Copy link
Collaborator

@sherzat3 sherzat3 Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's ensure we adhere to the Conventional Commits Specs for commit message formatting. I think in this case that'd be something like chore(conductor): Mark track '<track_description>' as complete

commands/conductor/implement.toml Outdated
- **Construct the Message:** Based on the records of which files were changed, construct a summary message.
- **Commit Changes:**
- If any files were changed (`product.md`, `tech-stack.md`, or `product-guidelines.md`), you MUST stage them and commit them.
- **Commit Message:** `conductor(docs): Synchronize docs for track '<track_description>'`
Copy link
Collaborator

@sherzat3 sherzat3 Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

commands/conductor/implement.toml Outdated
ii. **Archive Track Folder:** Move the track's folder from `conductor/tracks/<track_id>` to `conductor/archive/<track_id>`.
iii. **Remove from Tracks File:** Read the content of `conductor/tracks.md`, remove the entire section for the completed track (the part that starts with `---` and contains the track description), and write the modified content back to the file.
iv. **Announce Success:** Announce: "Track '<track_description>' has been successfully archived."
iv. **Commit Changes:** Stage `conductor/tracks.md` and `conductor/archive/`. Commit with the message `conductor(track): Archive track '<track_description>'`.
Copy link
Collaborator

@sherzat3 sherzat3 Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

@moisgobg moisgobg requested a review from sherzat3 January 5, 2026 22:26
@moisgobg moisgobg merged commit f6a1522 into main Jan 5, 2026
2 checks passed
@moisgobg moisgobg deleted the fix/issue-16-auto-commits branch January 5, 2026 22:51
@sherzat3 sherzat3 mentioned this pull request Jan 7, 2026
Closed
mahimashanware pushed a commit that referenced this pull request Jan 20, 2026
refactor(revert): Decouple revert logic from Git
a90cc7b 
Makes the revert command fully VCS-agnostic.

- Updates the  workflow with new abstract commands for
  searching commit history (,
  ).
- Replaces all hardcoded commit df6384e
Author: Mahima Shanware <mshanware@google.com>
Date:   Tue Jan 20 17:02:28 2026 +0000

    refactor(setup): Abstract VCS-specific file listing

    Revises the 'File Size and Relevance Triage' section to be fully
    VCS-agnostic.

    - Removes hardcoded examples of .github/workflows/release-please.yml
    .gitignore
    .release-please-manifest.json
    CONTRIBUTING.md
    GEMINI.md
    LICENSE
    README.md
    commands/conductor/implement.toml
    commands/conductor/newTrack.toml
    commands/conductor/revert.toml
    commands/conductor/setup.toml
    commands/conductor/status.toml
    gemini-extension.json
    release-please-config.json
    templates/code_styleguides/csharp.md
    templates/code_styleguides/dart.md
    templates/code_styleguides/general.md
    templates/code_styleguides/go.md
    templates/code_styleguides/html-css.md
    templates/code_styleguides/javascript.md
    templates/code_styleguides/python.md
    templates/code_styleguides/typescript.md
    templates/vcs_workflows/git.md
    templates/workflow.md and specific checks
      for .
    - Instructs the agent to use the abstract
      command from the loaded VCS workflow.
    - This ensures that the core logic for listing files is decoupled
      from the specific VCS implementation, adhering to the new
      architectural pattern.

    Change-Id: I2d7fbfee4dd17b98df417899a0b995e97c6014c1

commit 93219eb
Author: Mahima Shanware <mshanware@google.com>
Date:   Tue Jan 20 16:59:30 2026 +0000

    refactor(setup): Decouple VCS logic from project inception

    Revises the project setup process to be VCS-agnostic.

    - Adds a VCS discovery step at the beginning to identify the version
      control system (Git, Mercurial, etc.) and load a corresponding
      workflow file.
    - Replaces hardcoded On branch vcs-support
    Changes to be committed:
      (use "git restore --staged <file>..." to unstage)
            modified:   commands/conductor/setup.toml and Reinitialized existing Git repository in /usr/local/google/home/mshanware/conductor/.git/ commands with
      abstracted commands (, )
      from the loaded workflow.
    - In Greenfield projects, prompts the user to select their
      preferred VCS.
    - Preserves existing Brownfield indicators like dependency manifests
      and source code directories.

    Change-Id: Ic849d132324997548d9856b044372d2ba9279dc0

commit 8b514bc
Author: Mahima Shanware <mshanware@google.com>
Date:   Tue Jan 20 16:53:19 2026 +0000

    feat(vcs): Add git workflow for VCS abstraction

    Introduces a new workflow file, , which contains the specific Git commands required by the Conductor extension. This is the first step in decoupling the core logic from the version control system, allowing for future support of other systems like Mercurial or Jujutsu.

    The file defines a 'VCS contract' of abstract operations and their corresponding Git implementations.

    Change-Id: Ie8885b3bb58443d2736a355d0a14bb741826bc65

commit d2b5c9a
Merge: 716c758 08e9b95
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Tue Jan 13 16:43:44 2026 -0500

    Merge pull request #67 from nathenharvey/nathenharvey/newline-eof

    style(templates): add trailing newlines to styleguide templates

commit 08e9b95
Author: Nathen Harvey <nathenharvey@google.com>
Date:   Mon Jan 12 12:50:53 2026 -0500

    style(templates): add trailing newlines to styleguide templates

    Ensure that styleguide templates comply with POSIX standards by ending with a newline character. This improves
    compatibility with command-line tools and ensures consistent formatting for generated files.

    Modified files:
    - templates/code_styleguides/go.md
    - templates/code_styleguides/html-css.md
    - templates/code_styleguides/javascript.md
    - templates/code_styleguides/python.md
    - templates/code_styleguides/typescript.md

    Signed-off-by: Nathen Harvey <nathenharvey@google.com>

commit 716c758
Merge: 92080f0 e758efe
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Fri Jan 9 16:58:48 2026 -0500

    Merge pull request #65 from gemini-cli-extensions/chore/bot-release-token

    chore(github-actions): use dedicated bot token for release-please

commit e758efe
Author: sherzat <sherzat@google.com>
Date:   Fri Jan 9 21:54:03 2026 +0000

    chore(github-actions): use dedicated bot token for release-please

    Change-Id: Ieb55f9aee5525f95681407ff01b4b73b2baef714

commit 92080f0
Merge: f6a1522 84634e7
Author: Moisés Gana Obregón <78716364+moisgobg@users.noreply.github.com>
Date:   Tue Jan 6 12:21:35 2026 -0600

    Merge pull request #51 from gemini-cli-extensions/fix-checkbox-issue

    fix: standardize Markdown checkbox format for tracks and plans

commit 84634e7
Author: Moisés Gana Obregón <ganaobregon@google.com>
Date:   Mon Jan 5 22:12:30 2026 +0000

    fix: standardize Markdown checkbox format for tracks and plans

commit f6a1522
Merge: 653829b dd1cd1c
Author: Moisés Gana Obregón <78716364+moisgobg@users.noreply.github.com>
Date:   Mon Jan 5 16:51:07 2026 -0600

    Merge pull request #48 from gemini-cli-extensions/fix/issue-16-auto-commits

    fix(conductor): ensure track completion and doc sync are committed automatically

commit dd1cd1c
Author: Moisés Gana Obregón <ganaobregon@google.com>
Date:   Mon Jan 5 22:24:13 2026 +0000

    chore(conductor): Update commit message templates to follow Conventional Commits

commit e581544
Author: Moisés Gana Obregón <ganaobregon@google.com>
Date:   Sun Jan 4 08:23:00 2026 +0000

    correct step numbers

commit e3630ac
Author: Moisés Gana Obregón <ganaobregon@google.com>
Date:   Sat Jan 3 00:40:27 2026 +0000

    fix(conductor): ensure track completion and doc sync are committed automatically

    This adds explicit commit steps to the implement command for:
    - Track completion status updates in tracks.md
    - Project documentation synchronization
    - Track cleanup (archiving or deleting)

    BUG=16

commit 653829b
Merge: 6672f4e 830f584
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Fri Jan 2 16:04:01 2026 -0500

    Merge pull request #46 from gemini-cli-extensions/ci/add-release-please

    ci: add release-please workflow

commit 830f584
Author: sherzat <sherzat@google.com>
Date:   Fri Jan 2 20:27:32 2026 +0000

    fix: build tarball outside source tree to avoid self-inclusion

    Change-Id: I6b19d26db85220f25bbbf9509cd083fbd159b1dd

commit 3ef512c
Author: sherzat <sherzat@google.com>
Date:   Fri Jan 2 20:18:48 2026 +0000

    feat: integrate release asset packaging into release-please workflow

    Change-Id: I4ef04e2bfa1cd9bce8298baba041ad761eccc9d8

commit f26f1b8
Author: sherzat <sherzat@google.com>
Date:   Fri Jan 2 19:53:09 2026 +0000

    ci: add release-please workflow

    Change-Id: I7e5df1a8b1f269488e08c0ca9b18f77a08e2f80a

commit 6672f4e
Merge: aa81ce1 8bfc888
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Mon Dec 29 13:40:03 2025 -0500

    Merge pull request #10 from xbotter/main

    feat(styleguide): Add comprehensive Google C# Style Guide summary

commit aa81ce1
Merge: bcc86ab 819dcc9
Author: Moisés Gana Obregón <78716364+moisgobg@users.noreply.github.com>
Date:   Fri Dec 26 12:30:11 2025 -0600

    Merge pull request #26 from gemini-cli-extensions/fix/clarify-track-definition

commit 8bfc888
Author: xbotter <xbotter@users.noreply.github.com>
Date:   Wed Dec 24 02:17:30 2025 +0000

    fix(styleguide): Update C# guidelines by removing async method suffix rule and adding best practices for structs, collection types, file organization, and namespaces

commit 819dcc9
Author: moisgobg <moises.gana.o@gmail.com>
Date:   Tue Dec 23 16:25:14 2025 -0600

    fix(setup): clarify definition of 'track' in setup flow

commit bcc86ab
Merge: ab9516b ef2bcaa
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Tue Dec 23 13:28:21 2025 -0500

    Merge pull request #23 from jtmcdole/dart-style

    Add Dart Code Style

commit ef2bcaa
Author: John "codefu" McDole <john@mcdole.org>
Date:   Mon Dec 22 21:40:48 2025 -0800

    Add Dart Code Style

    This guide summarizes key recommendations from the official Effective Dart documentation, covering style, documentation, language usage, and API design principles. Adhering to these guidelines promotes consistent, readable, and maintainable Dart code.

commit 0e0991b
Author: xbotter <xbotter@users.noreply.github.com>
Date:   Tue Dec 23 04:58:34 2025 +0000

    fix(styleguide): Update C# guidelines for member ordering and enhance clarity on  string interpolation

commit eea7495
Author: xbotter <xbotter@users.noreply.github.com>
Date:   Tue Dec 23 03:12:02 2025 +0000

    fix(styleguide): Enhance C# guidelines with additional rules for constants, collections, and argument clarity

commit a67b6c0
Author: xbotter <xbotter@users.noreply.github.com>
Date:   Tue Dec 23 03:02:38 2025 +0000

    fix(styleguide): Clarify usage of 'var' in C# guidelines for better readability

commit 50f39ab
Author: xbotter <xbotter@users.noreply.github.com>
Date:   Tue Dec 23 02:41:12 2025 +0000

    fix(styleguide): Update C# formatting rules and guidelines for consistency

commit 5e51848
Merge: e222aca ab9516b
Author: xbotter <xbotter@users.noreply.github.com>
Date:   Tue Dec 23 10:24:25 2025 +0800

    Merge branch 'gemini-cli-extensions:main' into main

commit ab9516b
Merge: 916ceb2 d825c32
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Mon Dec 22 17:27:27 2025 -0500

    Merge pull request #17 from Ashwinhegde19/fix/typos-and-docs

    fix: Correct typos, step numbering, and documentation errors

commit 916ceb2
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Mon Dec 22 16:32:07 2025 -0500

    Bump version from 0.1.0 to 0.1.1

commit d825c32
Author: ashwinhegde19 <ashwinhegde19@gmail.com>
Date:   Sun Dec 21 00:17:58 2025 +0530

    fix: Correct typos, step numbering, and documentation errors

    - status.toml: Fix incorrect path (conductor/<id> -> conductor/tracks/<id>)
    - workflow.md: Fix step numbering errors in Phase Completion section
    - newTrack.toml: Remove trailing comma in JSON example
    - setup.toml: Remove trailing comma in JSON example
    - README.md: Add missing product-guidelines.md to artifacts list

commit e222aca
Author: xbotter <xbotter@users.noreply.github.com>
Date:   Fri Dec 19 09:12:02 2025 +0000

    feat(styleguide): Add comprehensive Google C# Style Guide summary

commit b49d770
Merge: 484d5f3 746b2e5
Author: Moisés Gana Obregón <78716364+moisgobg@users.noreply.github.com>
Date:   Thu Dec 18 13:02:25 2025 -0600

    Merge pull request #3 from gemini-cli-extensions/fix/user-agent-interaction-formats

    fix: Replace manual text input with interactive options

commit 484d5f3
Merge: 1e60e8a b90a4ea
Author: Moisés Gana Obregón <78716364+moisgobg@users.noreply.github.com>
Date:   Thu Dec 18 13:00:43 2025 -0600

    Merge pull request #1 from gemini-cli-extensions/fix/typos-grammar

    fix: Correct typos, trailing whitespace and grammar

commit b90a4ea
Author: Moisés Gana Obregón <ganaobregon@google.com>
Date:   Thu Dec 18 18:55:09 2025 +0000

    Fix typos and trailing whitespaces

commit a15eb67
Merge: 94edcbb 1e60e8a
Author: Moisés Gana Obregón <ganaobregon@google.com>
Date:   Thu Dec 18 18:32:02 2025 +0000

    Merge branch 'main' into fix/typos-grammar

    Resolves conflicts in conductor commands.

commit 1e60e8a
Author: Moisés Gana Obregón <78716364+moisgobg@users.noreply.github.com>
Date:   Thu Dec 18 12:13:47 2025 -0600

    fix(setup): Enhance project analysis protocol to avoid excessive token consumption. (#6)

    * fix(setup): Enhance project analysis protocol to avoid excessive token consumption.

    This commit updates the setup process in setup.toml to prioritize .geminiignore and .gitignore files for excluding irrelevant content during project analysis. The primary motivation for this change is to prevent excessive token consumption. The new protocol ensures that .geminiignore takes precedence and introduces git ls-files --exclude-standard -co for efficient directory/file listing, falling back to manual ignores only when no ignore files are present.

commit c2321a1
Merge: eaa947d 4915580
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Thu Dec 18 08:57:02 2025 -0500

    Merge pull request #5 from gemini-cli-extensions/refactor/standardize-conductor-path

    refactor: rename project-level `plan.md` to `tracks.md`

commit 4915580
Author: sherzat <sherzat@google.com>
Date:   Wed Dec 17 22:38:44 2025 +0000

    refactor: rename project-level `plan.md` to `tracks.md` and update references in documentation and command configurations

    Change-Id: I13ab825808fdba3cf7616d3c6e7311a5fbece600

commit eaa947d
Merge: e4c9322 dd57f50
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Wed Dec 17 17:16:36 2025 -0500

    Merge pull request #4 from gemini-cli-extensions/refactor/standardize-conductor-path

    refactor: standardize conductor directory path by removing leading dot.

commit dd57f50
Author: sherzat <sherzat@google.com>
Date:   Wed Dec 17 22:11:14 2025 +0000

    refactor: standardize conductor directory path by removing leading dot.

    Change-Id: I1f995bbdd7ebc99a79bd49223ccb5d6fa39b35c7

commit e4c9322
Author: sherzat <sherzat@google.com>
Date:   Wed Dec 17 20:41:34 2025 +0000

    docs: Simplify the development lifecycle, detail generated artifacts, and enhance the command reference in the README.

    Change-Id: Id185ee2ce44caa2838240c1463acbf455f1000b0

commit 746b2e5
Author: Moisés Gana Obregón <ganaobregon@google.com>
Date:   Wed Dec 17 18:24:12 2025 +0000

    fix: Replace manual text input with interactive options

commit 5e0fcb0
Merge: f0b2783 20858c9
Author: Sherzat Aitbayev <sherzat@google.com>
Date:   Wed Dec 17 13:06:22 2025 -0500

    Merge pull request #2 from gemini-cli-extensions/feat/github-actions-workflow

    feat: Add GitHub Actions workflow to package and upload release assets.

commit 20858c9
Author: sherzat <sherzat@google.com>
Date:   Wed Dec 17 18:02:40 2025 +0000

    feat: Add GitHub Actions workflow to package and upload release assets.

    Change-Id: I018079742aa9eca132952f6f464c37171863cb10

commit 94edcbb
Author: Moisés Gana Obregón <ganaobregon@google.com>
Date:   Wed Dec 17 17:57:22 2025 +0000

    fix: Correct typos, trailing whitespace and grammar

commit f0b2783
Author: Mahima Shanware <mshanware@google.com>
Date:   Tue Dec 16 21:06:27 2025 +0000

    add task clean up after finishing implement

    Change-Id: I3f27f41882a32396a06ab1c8a66ac1cae1d83b23

commit e915222
Author: sherzat <sherzat@google.com>
Date:   Wed Dec 17 16:05:04 2025 +0000

    Initial commit

    Change-Id: I3a212acf736c1a4b9a7672e5f259e92aab80a318 and  commands in
   with their abstract counterparts from the
   map.
- Changes the system directive to be a generic 'VCS-aware assistant'
  instead of a 'Git-aware assistant'.

Change-Id: Ibe3d7f35cab2ab0cf8e0b077a724578a297a1571
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sherzat3 sherzat3 sherzat3 approved these changes

Assignees

@moisgobg moisgobg

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uncommitted files after implementing a track

2 participants

@moisgobg @sherzat3