Support submodule diffs and upstream-base compares in Source Control

src/main/codex-accounts/runtime-home-service.test.ts

@@ -89,6 +89,7 @@ function createSettings(overrides: Partial<GlobalSettings> = {}): GlobalSettings
     rightSidebarOpenByDefault: true,
     sourceControlViewMode: 'list',
     sourceControlGroupOrder: 'changes-first',
+    sourceControlCompareAgainstUpstream: false,
     showTitlebarAppName: true,
     showTasksButton: true,
     floatingTerminalEnabled: false,

src/main/codex-accounts/service.test.ts

@@ -93,6 +93,7 @@ function createSettings(overrides: Partial<GlobalSettings> = {}): GlobalSettings
     rightSidebarOpenByDefault: true,
     sourceControlViewMode: 'list',
     sourceControlGroupOrder: 'changes-first',
+    sourceControlCompareAgainstUpstream: false,
     showTitlebarAppName: true,
     showTasksButton: true,
     floatingTerminalEnabled: false,

src/main/git/status-porcelain-parser.test.ts

@@ -40,6 +40,24 @@ describe('StatusPorcelainParser', () => {
     ])
   })
 
+  it('marks staged S... submodule rows as commit-changed gitlinks', () => {
+    const parser = new StatusPorcelainParser()
+    parser.update(
+      '1 M. S... 160000 160000 160000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb flutter_mine\n',
+      0
+    )
+    parser.finish()
+
+    expect(parser.entries).toEqual([
+      {
+        path: 'flutter_mine',
+        status: 'modified',
+        area: 'staged',
+        submodule: { commitChanged: true, trackedChanges: false, untrackedChanges: false }
+      }
+    ])
+  })
+
   it('collects unmerged lines for async resolution rather than parsing inline', () => {
     const parser = new StatusPorcelainParser()
     parser.update('u UU N... 100644 100644 100644 100644 aa bb cc both.ts\n', 0)

src/main/git/status-porcelain-parser.ts

@@ -132,7 +132,6 @@ export class StatusPorcelainParser {
     // "2 XY sub mH mI mW hH X<score> path\torigPath"
     const parts = line.split(' ')
     const xy = parts[1]
-    const submodule = parseSubmoduleStatus(parts[2])
     const indexStatus = xy[0]
     const worktreeStatus = xy[1]
 
@@ -149,7 +148,7 @@ export class StatusPorcelainParser {
           status: parseStatusChar(indexStatus),
           area: 'staged',
           oldPath,
-          ...(submodule ? { submodule } : {})
+          ...submoduleStatusField(parts[2], indexStatus)
         })
       }
       if (worktreeStatus !== '.') {
@@ -158,7 +157,7 @@ export class StatusPorcelainParser {
           status: parseStatusChar(worktreeStatus),
           area: 'unstaged',
           oldPath,
-          ...(submodule ? { submodule } : {})
+          ...submoduleStatusField(parts[2], worktreeStatus)
         })
       }
       return
@@ -170,15 +169,15 @@ export class StatusPorcelainParser {
         path,
         status: parseStatusChar(indexStatus),
         area: 'staged',
-        ...(submodule ? { submodule } : {})
+        ...submoduleStatusField(parts[2], indexStatus)
       })
     }
     if (worktreeStatus !== '.') {
       this.push({
         path,
         status: parseStatusChar(worktreeStatus),
         area: 'unstaged',
-        ...(submodule ? { submodule } : {})
+        ...submoduleStatusField(parts[2], worktreeStatus)
       })
     }
   }
@@ -207,14 +206,23 @@ export function parseStatusChar(char: string): GitStatusEntry['status'] {
 }
 
 export function parseSubmoduleStatus(
-  submoduleField: string | undefined
+  submoduleField: string | undefined,
+  statusChar = '.'
 ): GitStatusEntry['submodule'] {
   if (!submoduleField?.startsWith('S')) {
     return undefined
   }
   return {
-    commitChanged: submoduleField[1] === 'C',
+    commitChanged: submoduleField[1] === 'C' || (submoduleField === 'S...' && statusChar === 'M'),
     trackedChanges: submoduleField[2] === 'M',
     untrackedChanges: submoduleField[3] === 'U'
   }
 }
+
+function submoduleStatusField(
+  submoduleField: string | undefined,
+  statusChar: string
+): { submodule: GitStatusEntry['submodule'] } | {} {
+  const submodule = parseSubmoduleStatus(submoduleField, statusChar)
+  return submodule ? { submodule } : {}
+}