feat: add commit attribution with per-file AI contribution tracking

docs/users/configuration/settings.md

@@ -83,16 +83,17 @@ Settings are organized into categories. Most settings should be placed within th
 
 #### general
 
-| Setting                                    | Type    | Description                                                                                                                                                                     | Default     |
-| ------------------------------------------ | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
-| `general.preferredEditor`                  | string  | The preferred editor to open files in.                                                                                                                                          | `undefined` |
-| `general.vimMode`                          | boolean | Enable Vim keybindings.                                                                                                                                                         | `false`     |
-| `general.enableAutoUpdate`                 | boolean | Enable automatic update checks and installations on startup.                                                                                                                    | `true`      |
-| `general.showSessionRecap`                 | boolean | Auto-show a one-line "where you left off" recap when returning to the terminal after being away. Off by default. Use `/recap` to trigger manually regardless of this setting.   | `false`     |
-| `general.sessionRecapAwayThresholdMinutes` | number  | Minutes the terminal must be blurred before an auto-recap fires on focus-in. Only used when `showSessionRecap` is enabled.                                                      | `5`         |
-| `general.gitCoAuthor`                      | boolean | Automatically add a Co-authored-by trailer to git commit messages when commits are made through Qwen Code.                                                                      | `true`      |
-| `general.checkpointing.enabled`            | boolean | Enable session checkpointing for recovery.                                                                                                                                      | `false`     |
-| `general.defaultFileEncoding`              | string  | Default encoding for new files. Use `"utf-8"` (default) for UTF-8 without BOM, or `"utf-8-bom"` for UTF-8 with BOM. Only change this if your project specifically requires BOM. | `"utf-8"`   |
+| Setting                                    | Type    | Description                                                                                                                                                                               | Default     |
+| ------------------------------------------ | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
+| `general.preferredEditor`                  | string  | The preferred editor to open files in.                                                                                                                                                    | `undefined` |
+| `general.vimMode`                          | boolean | Enable Vim keybindings.                                                                                                                                                                   | `false`     |
+| `general.enableAutoUpdate`                 | boolean | Enable automatic update checks and installations on startup.                                                                                                                              | `true`      |
+| `general.showSessionRecap`                 | boolean | Auto-show a one-line "where you left off" recap when returning to the terminal after being away. Off by default. Use `/recap` to trigger manually regardless of this setting.             | `false`     |
+| `general.sessionRecapAwayThresholdMinutes` | number  | Minutes the terminal must be blurred before an auto-recap fires on focus-in. Only used when `showSessionRecap` is enabled.                                                                | `5`         |
+| `general.gitCoAuthor.commit`               | boolean | Add a Co-authored-by trailer to git commit messages AND attach a per-file AI-attribution git note (`refs/notes/ai-attribution`) for commits made through Qwen Code. Disabling skips both. | `true`      |
+| `general.gitCoAuthor.pr`                   | boolean | Append a Qwen Code attribution line to pull request descriptions when running `gh pr create`.                                                                                             | `true`      |
+| `general.checkpointing.enabled`            | boolean | Enable session checkpointing for recovery.                                                                                                                                                | `false`     |
+| `general.defaultFileEncoding`              | string  | Default encoding for new files. Use `"utf-8"` (default) for UTF-8 without BOM, or `"utf-8-bom"` for UTF-8 with BOM. Only change this if your project specifically requires BOM.           | `"utf-8"`   |
 
 #### output
 

integration-tests/cli/settings-migration.test.ts

@@ -24,16 +24,21 @@ const {
   v2PreexistingEnableSettings,
   v3LegacyDisableSettings,
   v999FutureVersionSettings,
+  v3GitCoAuthorBooleanSettings,
 } = workspacesSettings;
 
 /**
- * Integration tests for settings migration chain (V1 -> V2 -> V3)
+ * Integration tests for settings migration chain (V1 -> V2 -> V3 -> V4)
  *
  * These tests verify that:
- * 1. V1 settings are automatically migrated to V3 on CLI startup
- * 2. V2 settings are automatically migrated to V3 on CLI startup
- * 3. V3 settings remain unchanged
+ * 1. V1 settings are automatically migrated to V4 on CLI startup
+ * 2. V2 settings are automatically migrated to V4 on CLI startup
+ * 3. V3 settings are automatically migrated to V4 on CLI startup
  * 4. Migration is idempotent (running multiple times produces same result)
+ *
+ * The numeric assertions use the literal `4` to match
+ * `SETTINGS_VERSION`; bump that constant and the literal together
+ * when adding a future migration.
  */
 describe('settings-migration', () => {
   let rig: TestRig;
@@ -77,7 +82,7 @@ describe('settings-migration', () => {
   };
 
   describe('V1 settings migration', () => {
-    it('should migrate V1 settings to V3 on CLI startup', async () => {
+    it('should migrate V1 settings forward through the chain on CLI startup', async () => {
       rig.setup('v1-to-v3-migration');
 
       // Write V1 settings directly (overwrites the one created by setup)
@@ -94,8 +99,8 @@ describe('settings-migration', () => {
       // Read migrated settings
       const migratedSettings = readSettingsFile(rig);
 
-      // Verify migration to V3
-      expect(migratedSettings['$version']).toBe(3);
+      // Verify migration to V4 (current SETTINGS_VERSION)
+      expect(migratedSettings['$version']).toBe(4);
       expect(migratedSettings['ui']).toEqual({
         theme: 'dark',
         hideTips: false,
@@ -137,7 +142,7 @@ describe('settings-migration', () => {
       const migratedSettings = readSettingsFile(rig);
 
       // Expected output based on stable test output
-      expect(migratedSettings['$version']).toBe(3);
+      expect(migratedSettings['$version']).toBe(4);
       expect(migratedSettings['tools']).toEqual({ autoAccept: false });
       expect(migratedSettings['context']).toEqual({ includeDirectories: [] });
       expect(migratedSettings['model']).toEqual({ name: ['gemini', 'claude'] });
@@ -161,8 +166,8 @@ describe('settings-migration', () => {
       // Read migrated settings
       const migratedSettings = readSettingsFile(rig);
 
-      // Should be migrated to V3
-      expect(migratedSettings['$version']).toBe(3);
+      // Should be migrated to V4
+      expect(migratedSettings['$version']).toBe(4);
       // Legacy string values for ui/general should be preserved as-is (user data)
       expect(migratedSettings['ui']).toBe('legacy-ui-string');
       expect(migratedSettings['general']).toBe('legacy-general-string');
@@ -189,7 +194,7 @@ describe('settings-migration', () => {
       const migratedSettings = readSettingsFile(rig);
 
       // Expected output based on stable test output
-      expect(migratedSettings['$version']).toBe(3);
+      expect(migratedSettings['$version']).toBe(4);
       expect(migratedSettings['model']).toEqual({ name: 'qwen-plus' });
       expect(migratedSettings['ui']).toEqual({
         hideWindowTitle: true,
@@ -209,7 +214,7 @@ describe('settings-migration', () => {
   });
 
   describe('V2 settings migration', () => {
-    it('should migrate V2 settings to V3 on CLI startup', async () => {
+    it('should migrate V2 settings forward through the chain on CLI startup', async () => {
       rig.setup('v2-to-v3-migration');
 
       // Write V2 settings directly (overwrites the one created by setup)
@@ -225,8 +230,8 @@ describe('settings-migration', () => {
       // Read migrated settings
       const migratedSettings = readSettingsFile(rig);
 
-      // Verify migration to V3
-      expect(migratedSettings['$version']).toBe(3);
+      // Verify migration to V4 (current SETTINGS_VERSION)
+      expect(migratedSettings['$version']).toBe(4);
 
       // Verify disable* -> enable* conversion with inversion
       expect(
@@ -302,8 +307,8 @@ describe('settings-migration', () => {
       // Read migrated settings
       const migratedSettings = readSettingsFile(rig);
 
-      // Should be updated to V3 version
-      expect(migratedSettings['$version']).toBe(3);
+      // Should be updated to V4 version
+      expect(migratedSettings['$version']).toBe(4);
       // Other settings should remain unchanged
       expect(migratedSettings['ui']).toEqual({ theme: 'dark' });
       expect(migratedSettings['model']).toEqual({ name: 'gemini' });
@@ -330,12 +335,12 @@ describe('settings-migration', () => {
       const migratedSettings = readSettingsFile(rig);
 
       // Version metadata should still be normalized to current version
-      expect(migratedSettings['$version']).toBe(3);
+      expect(migratedSettings['$version']).toBe(4);
       // Existing user content should be preserved
       expect(migratedSettings['customOnlyKey']).toBe('value');
     });
 
-    it('should coerce valid string booleans and remove invalid deprecated keys while bumping V2 to V3', async () => {
+    it('should coerce valid string booleans and remove invalid deprecated keys while bumping V2 forward through the chain', async () => {
       rig.setup('v2-non-boolean-disable-values-migration');
 
       // Cover both coercible string booleans and invalid non-boolean values:
@@ -372,7 +377,7 @@ describe('settings-migration', () => {
       const migratedSettings = readSettingsFile(rig);
 
       // Coercible strings are migrated; invalid disable* values are removed.
-      expect(migratedSettings['$version']).toBe(3);
+      expect(migratedSettings['$version']).toBe(4);
       expect(migratedSettings['general']).toEqual({
         enableAutoUpdate: false,
       });
@@ -437,7 +442,7 @@ describe('settings-migration', () => {
       const migratedSettings = readSettingsFile(rig);
 
       // Expected output based on stable test output
-      expect(migratedSettings['$version']).toBe(3);
+      expect(migratedSettings['$version']).toBe(4);
       // Migration converts disable* to enable* by inverting the value
       // disableAutoUpdate: false -> enableAutoUpdate: true (inverted)
       // But disableUpdateNag: true may affect the consolidation
@@ -501,11 +506,10 @@ describe('settings-migration', () => {
       // Read settings
       const finalSettings = readSettingsFile(rig);
 
-      // Should remain V3
-      expect(finalSettings['$version']).toBe(3);
-      // Note: V3 settings with legacy disable* keys are left as-is
-      // Migration only runs when version < current version
-      // Since this is already V3, no migration logic is applied
+      // V3 → V4 migration bumps the version; V3→V4 only touches
+      // general.gitCoAuthor, so unrelated legacy disable* keys remain as-is
+      // (V2→V3 ran on original V3 load, not re-applied here).
+      expect(finalSettings['$version']).toBe(4);
       expect(
         (finalSettings['general'] as Record<string, unknown>)?.[
           'disableAutoUpdate'
@@ -536,6 +540,44 @@ describe('settings-migration', () => {
         note: 'should remain unchanged in v3',
       });
     });
+
+    // V3 used to allow `general.gitCoAuthor: <boolean>`. The V3→V4
+    // migration must expand that boolean into the new
+    // `{ commit, pr }` object shape so the user's stored opt-out
+    // doesn't get silently overwritten by the schema defaults
+    // (which default both sub-toggles to `true`) on the next save.
+    // The unit test in `v3-to-v4.test.ts` already pins the
+    // migration body, but without an end-to-end fixture the real
+    // CLI load → migrate → write path could regress without
+    // this suite noticing.
+    it('should expand legacy boolean general.gitCoAuthor: false through V3 → V4', async () => {
+      rig.setup('v3-gitcoauthor-boolean');
+
+      overwriteSettingsFile(rig, v3GitCoAuthorBooleanSettings);
+
+      try {
+        await rig.runCommand(['mcp', 'list']);
+      } catch {
+        // Expected to potentially fail
+      }
+
+      const finalSettings = readSettingsFile(rig);
+
+      expect(finalSettings['$version']).toBe(4);
+      expect(
+        (finalSettings['general'] as Record<string, unknown>)?.['gitCoAuthor'],
+      ).toEqual({ commit: false, pr: false });
+      // Sibling general.* keys must survive the migration unchanged.
+      expect(
+        (finalSettings['general'] as Record<string, unknown>)?.[
+          'disableAutoUpdate'
+        ],
+      ).toBe(true);
+      // And so must unrelated top-level sections.
+      expect(finalSettings['custom']).toEqual({
+        note: 'preserve me through v3->v4',
+      });
+    });
   });
 
   describe('Future version settings handling', () => {

integration-tests/fixtures/settings-migration/workspaces.json

@@ -184,5 +184,15 @@
     "experimentalFlag": {
       "enabled": true
     }
+  },
+  "v3GitCoAuthorBooleanSettings": {
+    "$version": 3,
+    "general": {
+      "gitCoAuthor": false,
+      "disableAutoUpdate": true
+    },
+    "custom": {
+      "note": "preserve me through v3->v4"
+    }
   }
 }