fix(agents): use first @ after last slash in splitTrailingAuthProfile

haosenwang1018 · claude · haosenwang1018 · commit 09c9dbb58cef · 2026-03-02T03:46:39.000+08:00
The parser used `lastIndexOf("@")` which incorrectly split email-based Auth Profile IDs like `google-gemini-cli:test@gmail.com`. By searching for the first `@` after the last `/` instead, both scoped model paths (e.g. `@cf/...`) and email-containing profiles are handled correctly. Closes #30912 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
diff --git a/src/agents/model-ref-profile.test.ts b/src/agents/model-ref-profile.test.ts
@@ -46,4 +46,11 @@ describe("splitTrailingAuthProfile", () => {
       model: "provider/foo@bar/baz",
     });
   });
+
+  it("uses first @ after last slash for email-based auth profiles", () => {
+    expect(splitTrailingAuthProfile("flash@google-gemini-cli:test@gmail.com")).toEqual({
+      model: "flash",
+      profile: "google-gemini-cli:test@gmail.com",
+    });
+  });
 });
diff --git a/src/agents/model-ref-profile.ts b/src/agents/model-ref-profile.ts
@@ -7,9 +7,9 @@ export function splitTrailingAuthProfile(raw: string): {
     return { model: "" };
   }
 
-  const profileDelimiter = trimmed.lastIndexOf("@");
   const lastSlash = trimmed.lastIndexOf("/");
-  if (profileDelimiter <= 0 || profileDelimiter <= lastSlash) {
+  const profileDelimiter = trimmed.indexOf("@", lastSlash + 1);
+  if (profileDelimiter <= 0) {
     return { model: trimmed };
   }
 

-Original file line number
+Diff line change
       model: "provider/foo@bar/baz",
     });
   });
++
 +  it("uses first @ after last slash for email-based auth profiles", () => {
 +    expect(splitTrailingAuthProfile("flash@google-gemini-cli:[email protected]")).toEqual({
 +      model: "flash",
 +      profile: "google-gemini-cli:[email protected]",
 +    });
 +  });
 });
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ export function splitTrailingAuthProfile(raw: string): {`
`7`	`7`	`return { model: "" };`
`8`	`8`	`}`
`9`	`9`
`10`		`- const profileDelimiter = trimmed.lastIndexOf("@");`
`11`	`10`	`const lastSlash = trimmed.lastIndexOf("/");`
`12`		`- if (profileDelimiter <= 0 \|\| profileDelimiter <= lastSlash) {`
	`11`	`+ const profileDelimiter = trimmed.indexOf("@", lastSlash + 1);`
	`12`	`+ if (profileDelimiter <= 0) {`
`13`	`13`	`return { model: trimmed };`
`14`	`14`	`}`
`15`	`15`