From 11b2a804034bf3f8a21bcc800f72b3d2bb10ac22 Mon Sep 17 00:00:00 2001
From: Marco Mura <mmura@atlassian.com>
Date: Thu, 20 Feb 2025 11:47:58 -0800
Subject: [PATCH 1/8] Added branch name validation for space characters

---
 src/react/atlascode/startwork/StartWorkPage.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/react/atlascode/startwork/StartWorkPage.tsx b/src/react/atlascode/startwork/StartWorkPage.tsx
index 940d0a49..e1cd3074 100644
--- a/src/react/atlascode/startwork/StartWorkPage.tsx
+++ b/src/react/atlascode/startwork/StartWorkPage.tsx
@@ -181,6 +181,8 @@ const StartWorkPage: React.FunctionComponent = () => {
 
     const handleLocalBranchChange = useCallback(
         (event: React.ChangeEvent<{ name?: string | undefined; value: string }>) => {
+            // spaces are not allowed in branch names
+            event.target.value = event.target.value.replace(/ /g, '-');
             setLocalBranch(event.target.value);
         },
         [setLocalBranch],

From 9b93482e69c7b758468e7dbb8efb9bfdc095a7b5 Mon Sep 17 00:00:00 2001
From: Marco Mura <mmura@atlassian.com>
Date: Thu, 20 Feb 2025 12:37:13 -0800
Subject: [PATCH 2/8] Expose toggle switch to push branch to origin (Start
 work)

---
 src/ipc/issueActions.ts                       |  1 +
 src/lib/ipc/fromUI/startWork.ts               |  1 +
 .../startwork/startWorkActionApi.ts           |  1 +
 .../startwork/startWorkWebviewController.ts   |  1 +
 .../atlascode/startwork/StartWorkPage.tsx     | 27 +++++++++++++++++++
 .../startwork/startWorkController.ts          |  3 +++
 .../startwork/vscStartWorkActionApi.ts        |  7 +++--
 .../components/issue/StartWorkPage.tsx        |  1 +
 .../startWorkOnBitbucketIssueWebview.ts       |  8 +++++-
 src/webviews/startWorkOnIssueWebview.ts       |  9 ++++---
 10 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/ipc/issueActions.ts b/src/ipc/issueActions.ts
index a8df0823..ec002ca3 100644
--- a/src/ipc/issueActions.ts
+++ b/src/ipc/issueActions.ts
@@ -120,6 +120,7 @@ export interface StartWorkAction extends Action {
     remoteName: string;
     setupJira: boolean;
     setupBitbucket: boolean;
+    pushBranchToOrigin: boolean;
 }
 
 export interface OpenStartWorkPageAction extends Action {
diff --git a/src/lib/ipc/fromUI/startWork.ts b/src/lib/ipc/fromUI/startWork.ts
index 6a2968bc..d3f2597b 100644
--- a/src/lib/ipc/fromUI/startWork.ts
+++ b/src/lib/ipc/fromUI/startWork.ts
@@ -27,6 +27,7 @@ export interface StartRequestAction {
     sourceBranch: Branch;
     targetBranch: string;
     upstream: string;
+    pushBranchToOrigin: boolean;
 }
 
 export interface OpenSettingsAction {
diff --git a/src/lib/webview/controller/startwork/startWorkActionApi.ts b/src/lib/webview/controller/startwork/startWorkActionApi.ts
index fb182cfa..22396d99 100644
--- a/src/lib/webview/controller/startwork/startWorkActionApi.ts
+++ b/src/lib/webview/controller/startwork/startWorkActionApi.ts
@@ -17,6 +17,7 @@ export interface StartWorkActionApi {
         destinationBranch: string,
         sourceBranch: Branch,
         remote: string,
+        pushBranchToOrigin: boolean,
     ): Promise<void>;
     closePage(): void;
     getStartWorkConfig(): StartWorkBranchTemplate;
diff --git a/src/lib/webview/controller/startwork/startWorkWebviewController.ts b/src/lib/webview/controller/startwork/startWorkWebviewController.ts
index bd25f91e..e87eeadd 100644
--- a/src/lib/webview/controller/startwork/startWorkWebviewController.ts
+++ b/src/lib/webview/controller/startwork/startWorkWebviewController.ts
@@ -134,6 +134,7 @@ export class StartWorkWebviewController implements WebviewController<StartWorkIs
                             msg.targetBranch,
                             msg.sourceBranch,
                             msg.upstream,
+                            msg.pushBranchToOrigin,
                         );
                     }
                     this.postMessage({
diff --git a/src/react/atlascode/startwork/StartWorkPage.tsx b/src/react/atlascode/startwork/StartWorkPage.tsx
index e1cd3074..43009386 100644
--- a/src/react/atlascode/startwork/StartWorkPage.tsx
+++ b/src/react/atlascode/startwork/StartWorkPage.tsx
@@ -95,6 +95,7 @@ const StartWorkPage: React.FunctionComponent = () => {
 
     const [transitionIssueEnabled, setTransitionIssueEnabled] = useState(true);
     const [branchSetupEnabled, setbranchSetupEnabled] = useState(true);
+    const [pushBranchEnabled, setPushBranchEnabled] = useState(false);
     const [transition, setTransition] = useState<Transition>(emptyTransition);
     const [repository, setRepository] = useState<RepoData>(emptyRepoData);
     const [branchType, setBranchType] = useState<BranchType>(emptyPrefix);
@@ -120,6 +121,8 @@ const StartWorkPage: React.FunctionComponent = () => {
         [branchSetupEnabled],
     );
 
+    const togglePushBranchEnabled = useCallback(() => setPushBranchEnabled(!pushBranchEnabled), [pushBranchEnabled]);
+
     const handleTransitionChange = useCallback(
         (event: React.ChangeEvent<{ name?: string | undefined; value: any }>) => {
             setTransition(event.target.value);
@@ -248,6 +251,7 @@ const StartWorkPage: React.FunctionComponent = () => {
                 sourceBranch,
                 localBranch,
                 upstream,
+                pushBranchEnabled,
             );
             setSubmitState('submit-success');
             setSubmitResponse(response);
@@ -264,6 +268,7 @@ const StartWorkPage: React.FunctionComponent = () => {
         sourceBranch,
         localBranch,
         upstream,
+        pushBranchEnabled,
     ]);
 
     const handleOpenSettings = useCallback(() => {
@@ -704,6 +709,28 @@ const StartWorkPage: React.FunctionComponent = () => {
                                                 </Grid>
                                             </Collapse>
                                         </Grid>
+                                        <Grid item hidden={submitState === 'submit-success'}>
+                                            <Divider />
+                                        </Grid>
+                                        <Grid item hidden={submitState === 'submit-success'}>
+                                            <Grid container spacing={1} direction="row">
+                                                <Grid item>
+                                                    <Switch
+                                                        color="primary"
+                                                        size="small"
+                                                        checked={pushBranchEnabled}
+                                                        onClick={togglePushBranchEnabled}
+                                                    />
+                                                </Grid>
+                                                <Grid item>
+                                                    <Typography variant="h4">
+                                                        <Box fontWeight="fontWeightBold">
+                                                            Push the new branch to origin
+                                                        </Box>
+                                                    </Typography>
+                                                </Grid>
+                                            </Grid>
+                                        </Grid>
                                         <Grid item hidden={submitState === 'submit-success'}>
                                             <Button
                                                 variant="contained"
diff --git a/src/react/atlascode/startwork/startWorkController.ts b/src/react/atlascode/startwork/startWorkController.ts
index d206a369..e3be9123 100644
--- a/src/react/atlascode/startwork/startWorkController.ts
+++ b/src/react/atlascode/startwork/startWorkController.ts
@@ -30,6 +30,7 @@ export interface StartWorkControllerApi {
         sourceBranch: Branch,
         targetBranch: string,
         upstream: string,
+        pushBranchToOrigin: boolean,
     ) => Promise<{ transistionStatus?: string; branch?: string; upstream?: string }>;
     closePage: () => void;
     openJiraIssue: () => void;
@@ -122,6 +123,7 @@ export function useStartWorkController(): [StartWorkState, StartWorkControllerAp
             sourceBranch: Branch,
             targetBranch: string,
             upstream: string,
+            pushBranchToOrigin: boolean,
         ): Promise<StartWorkResponseMessage> => {
             return new Promise<StartWorkResponseMessage>((resolve, reject) => {
                 (async () => {
@@ -136,6 +138,7 @@ export function useStartWorkController(): [StartWorkState, StartWorkControllerAp
                                 sourceBranch,
                                 targetBranch,
                                 upstream,
+                                pushBranchToOrigin,
                             },
                             StartWorkMessageType.StartWorkResponse,
                             ConnectionTimeout,
diff --git a/src/webview/startwork/vscStartWorkActionApi.ts b/src/webview/startwork/vscStartWorkActionApi.ts
index 9b9680f7..b66c72de 100644
--- a/src/webview/startwork/vscStartWorkActionApi.ts
+++ b/src/webview/startwork/vscStartWorkActionApi.ts
@@ -50,6 +50,7 @@ export class VSCStartWorkActionApi implements StartWorkActionApi {
         destinationBranch: string,
         sourceBranch: Branch,
         remote: string,
+        pushBranchToOrigin: boolean,
     ): Promise<void> {
         const scm = Container.bitbucketContext.getRepositoryScm(wsRepo.rootUri)!;
 
@@ -74,8 +75,10 @@ export class VSCStartWorkActionApi implements StartWorkActionApi {
             true,
             `${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
         );
-        await scm.push(remote, destinationBranch, true);
-        return;
+
+        if (pushBranchToOrigin) {
+            await scm.push(remote, destinationBranch, true);
+        }
     }
 
     getStartWorkConfig(): StartWorkBranchTemplate {
diff --git a/src/webviews/components/issue/StartWorkPage.tsx b/src/webviews/components/issue/StartWorkPage.tsx
index 7c0eaae1..fecd9bf2 100644
--- a/src/webviews/components/issue/StartWorkPage.tsx
+++ b/src/webviews/components/issue/StartWorkPage.tsx
@@ -261,6 +261,7 @@ export default class StartWorkPage extends WebviewComponent<Emit, Accept, {}, St
             transition: this.state.transition,
             setupJira: this.state.jiraSetupEnabled,
             setupBitbucket: this.isEmptyRepo(this.state.repo) ? false : this.state.bitbucketSetupEnabled,
+            pushBranchToOrigin: false,
         });
     };
 
diff --git a/src/webviews/startWorkOnBitbucketIssueWebview.ts b/src/webviews/startWorkOnBitbucketIssueWebview.ts
index e7ae9081..39ba11bb 100644
--- a/src/webviews/startWorkOnBitbucketIssueWebview.ts
+++ b/src/webviews/startWorkOnBitbucketIssueWebview.ts
@@ -105,6 +105,7 @@ export class StartWorkOnBitbucketIssueWebview
                                     e.targetBranchName,
                                     e.sourceBranch,
                                     e.remoteName,
+                                    e.pushBranchToOrigin,
                                 );
                             }
 
@@ -138,6 +139,7 @@ export class StartWorkOnBitbucketIssueWebview
         destBranch: string,
         sourceBranch: Branch,
         remote: string,
+        pushBranchToOrigin: boolean,
     ): Promise<void> {
         // checkout if a branch exists already
         try {
@@ -160,7 +162,11 @@ export class StartWorkOnBitbucketIssueWebview
             true,
             `${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
         );
-        await repo.push(remote, destBranch, true);
+
+        if (pushBranchToOrigin) {
+            await repo.push(remote, destBranch, true);
+        }
+
         return;
     }
 
diff --git a/src/webviews/startWorkOnIssueWebview.ts b/src/webviews/startWorkOnIssueWebview.ts
index 107b9d2e..1e7e5109 100644
--- a/src/webviews/startWorkOnIssueWebview.ts
+++ b/src/webviews/startWorkOnIssueWebview.ts
@@ -69,7 +69,6 @@ export class StartWorkOnIssueWebview
             });
         }
         this.updateIssue(data);
-        return;
     }
 
     public async invalidate() {
@@ -113,6 +112,7 @@ export class StartWorkOnIssueWebview
                                     e.targetBranchName,
                                     e.sourceBranch,
                                     e.remoteName,
+                                    e.pushBranchToOrigin,
                                 );
                             }
                             const currentUserId = issue.siteDetails.userId;
@@ -151,6 +151,7 @@ export class StartWorkOnIssueWebview
         destBranch: string,
         sourceBranch: Branch,
         remote: string,
+        pushBranchToOrigin: boolean,
     ): Promise<void> {
         // checkout if a branch exists already
         try {
@@ -173,8 +174,10 @@ export class StartWorkOnIssueWebview
             true,
             `${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
         );
-        await repo.push(remote, destBranch, true);
-        return;
+
+        if (pushBranchToOrigin) {
+            await repo.push(remote, destBranch, true);
+        }
     }
 
     public async updateIssue(issue: MinimalIssue<DetailedSiteInfo>) {

From 2cc01781a8f0bd2d07673ff0811e66e64d69a144 Mon Sep 17 00:00:00 2001
From: Marco Mura <mmura@atlassian.com>
Date: Thu, 20 Feb 2025 13:01:20 -0800
Subject: [PATCH 3/8] Refer to 'remote' not 'origin'

---
 src/ipc/issueActions.ts                                     | 2 +-
 src/lib/ipc/fromUI/startWork.ts                             | 2 +-
 src/lib/webview/controller/startwork/startWorkActionApi.ts  | 2 +-
 .../controller/startwork/startWorkWebviewController.ts      | 2 +-
 src/react/atlascode/startwork/StartWorkPage.tsx             | 2 +-
 src/react/atlascode/startwork/startWorkController.ts        | 6 +++---
 src/webview/startwork/vscStartWorkActionApi.ts              | 4 ++--
 src/webviews/components/issue/StartWorkPage.tsx             | 2 +-
 src/webviews/startWorkOnBitbucketIssueWebview.ts            | 6 +++---
 src/webviews/startWorkOnIssueWebview.ts                     | 6 +++---
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/ipc/issueActions.ts b/src/ipc/issueActions.ts
index ec002ca3..bad0a37c 100644
--- a/src/ipc/issueActions.ts
+++ b/src/ipc/issueActions.ts
@@ -120,7 +120,7 @@ export interface StartWorkAction extends Action {
     remoteName: string;
     setupJira: boolean;
     setupBitbucket: boolean;
-    pushBranchToOrigin: boolean;
+    pushBranchToRemote: boolean;
 }
 
 export interface OpenStartWorkPageAction extends Action {
diff --git a/src/lib/ipc/fromUI/startWork.ts b/src/lib/ipc/fromUI/startWork.ts
index d3f2597b..5e081b24 100644
--- a/src/lib/ipc/fromUI/startWork.ts
+++ b/src/lib/ipc/fromUI/startWork.ts
@@ -27,7 +27,7 @@ export interface StartRequestAction {
     sourceBranch: Branch;
     targetBranch: string;
     upstream: string;
-    pushBranchToOrigin: boolean;
+    pushBranchToRemote: boolean;
 }
 
 export interface OpenSettingsAction {
diff --git a/src/lib/webview/controller/startwork/startWorkActionApi.ts b/src/lib/webview/controller/startwork/startWorkActionApi.ts
index 22396d99..40143281 100644
--- a/src/lib/webview/controller/startwork/startWorkActionApi.ts
+++ b/src/lib/webview/controller/startwork/startWorkActionApi.ts
@@ -17,7 +17,7 @@ export interface StartWorkActionApi {
         destinationBranch: string,
         sourceBranch: Branch,
         remote: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ): Promise<void>;
     closePage(): void;
     getStartWorkConfig(): StartWorkBranchTemplate;
diff --git a/src/lib/webview/controller/startwork/startWorkWebviewController.ts b/src/lib/webview/controller/startwork/startWorkWebviewController.ts
index e87eeadd..67bc8b1b 100644
--- a/src/lib/webview/controller/startwork/startWorkWebviewController.ts
+++ b/src/lib/webview/controller/startwork/startWorkWebviewController.ts
@@ -134,7 +134,7 @@ export class StartWorkWebviewController implements WebviewController<StartWorkIs
                             msg.targetBranch,
                             msg.sourceBranch,
                             msg.upstream,
-                            msg.pushBranchToOrigin,
+                            msg.pushBranchToRemote,
                         );
                     }
                     this.postMessage({
diff --git a/src/react/atlascode/startwork/StartWorkPage.tsx b/src/react/atlascode/startwork/StartWorkPage.tsx
index 43009386..5664ec96 100644
--- a/src/react/atlascode/startwork/StartWorkPage.tsx
+++ b/src/react/atlascode/startwork/StartWorkPage.tsx
@@ -725,7 +725,7 @@ const StartWorkPage: React.FunctionComponent = () => {
                                                 <Grid item>
                                                     <Typography variant="h4">
                                                         <Box fontWeight="fontWeightBold">
-                                                            Push the new branch to origin
+                                                            Push the new branch to remote
                                                         </Box>
                                                     </Typography>
                                                 </Grid>
diff --git a/src/react/atlascode/startwork/startWorkController.ts b/src/react/atlascode/startwork/startWorkController.ts
index e3be9123..6c35c00e 100644
--- a/src/react/atlascode/startwork/startWorkController.ts
+++ b/src/react/atlascode/startwork/startWorkController.ts
@@ -30,7 +30,7 @@ export interface StartWorkControllerApi {
         sourceBranch: Branch,
         targetBranch: string,
         upstream: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ) => Promise<{ transistionStatus?: string; branch?: string; upstream?: string }>;
     closePage: () => void;
     openJiraIssue: () => void;
@@ -123,7 +123,7 @@ export function useStartWorkController(): [StartWorkState, StartWorkControllerAp
             sourceBranch: Branch,
             targetBranch: string,
             upstream: string,
-            pushBranchToOrigin: boolean,
+            pushBranchToRemote: boolean,
         ): Promise<StartWorkResponseMessage> => {
             return new Promise<StartWorkResponseMessage>((resolve, reject) => {
                 (async () => {
@@ -138,7 +138,7 @@ export function useStartWorkController(): [StartWorkState, StartWorkControllerAp
                                 sourceBranch,
                                 targetBranch,
                                 upstream,
-                                pushBranchToOrigin,
+                                pushBranchToRemote,
                             },
                             StartWorkMessageType.StartWorkResponse,
                             ConnectionTimeout,
diff --git a/src/webview/startwork/vscStartWorkActionApi.ts b/src/webview/startwork/vscStartWorkActionApi.ts
index b66c72de..64495ad5 100644
--- a/src/webview/startwork/vscStartWorkActionApi.ts
+++ b/src/webview/startwork/vscStartWorkActionApi.ts
@@ -50,7 +50,7 @@ export class VSCStartWorkActionApi implements StartWorkActionApi {
         destinationBranch: string,
         sourceBranch: Branch,
         remote: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ): Promise<void> {
         const scm = Container.bitbucketContext.getRepositoryScm(wsRepo.rootUri)!;
 
@@ -76,7 +76,7 @@ export class VSCStartWorkActionApi implements StartWorkActionApi {
             `${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
         );
 
-        if (pushBranchToOrigin) {
+        if (pushBranchToRemote) {
             await scm.push(remote, destinationBranch, true);
         }
     }
diff --git a/src/webviews/components/issue/StartWorkPage.tsx b/src/webviews/components/issue/StartWorkPage.tsx
index fecd9bf2..2b050603 100644
--- a/src/webviews/components/issue/StartWorkPage.tsx
+++ b/src/webviews/components/issue/StartWorkPage.tsx
@@ -261,7 +261,7 @@ export default class StartWorkPage extends WebviewComponent<Emit, Accept, {}, St
             transition: this.state.transition,
             setupJira: this.state.jiraSetupEnabled,
             setupBitbucket: this.isEmptyRepo(this.state.repo) ? false : this.state.bitbucketSetupEnabled,
-            pushBranchToOrigin: false,
+            pushBranchToRemote: false,
         });
     };
 
diff --git a/src/webviews/startWorkOnBitbucketIssueWebview.ts b/src/webviews/startWorkOnBitbucketIssueWebview.ts
index 39ba11bb..702c1628 100644
--- a/src/webviews/startWorkOnBitbucketIssueWebview.ts
+++ b/src/webviews/startWorkOnBitbucketIssueWebview.ts
@@ -105,7 +105,7 @@ export class StartWorkOnBitbucketIssueWebview
                                     e.targetBranchName,
                                     e.sourceBranch,
                                     e.remoteName,
-                                    e.pushBranchToOrigin,
+                                    e.pushBranchToRemote,
                                 );
                             }
 
@@ -139,7 +139,7 @@ export class StartWorkOnBitbucketIssueWebview
         destBranch: string,
         sourceBranch: Branch,
         remote: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ): Promise<void> {
         // checkout if a branch exists already
         try {
@@ -163,7 +163,7 @@ export class StartWorkOnBitbucketIssueWebview
             `${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
         );
 
-        if (pushBranchToOrigin) {
+        if (pushBranchToRemote) {
             await repo.push(remote, destBranch, true);
         }
 
diff --git a/src/webviews/startWorkOnIssueWebview.ts b/src/webviews/startWorkOnIssueWebview.ts
index 1e7e5109..61288e0e 100644
--- a/src/webviews/startWorkOnIssueWebview.ts
+++ b/src/webviews/startWorkOnIssueWebview.ts
@@ -112,7 +112,7 @@ export class StartWorkOnIssueWebview
                                     e.targetBranchName,
                                     e.sourceBranch,
                                     e.remoteName,
-                                    e.pushBranchToOrigin,
+                                    e.pushBranchToRemote,
                                 );
                             }
                             const currentUserId = issue.siteDetails.userId;
@@ -151,7 +151,7 @@ export class StartWorkOnIssueWebview
         destBranch: string,
         sourceBranch: Branch,
         remote: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ): Promise<void> {
         // checkout if a branch exists already
         try {
@@ -175,7 +175,7 @@ export class StartWorkOnIssueWebview
             `${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
         );
 
-        if (pushBranchToOrigin) {
+        if (pushBranchToRemote) {
             await repo.push(remote, destBranch, true);
         }
     }

From d2469fae0ccb86323b3c5118c057c1f111974e9a Mon Sep 17 00:00:00 2001
From: Marco Mura <mmura@atlassian.com>
Date: Thu, 20 Feb 2025 22:18:08 -0800
Subject: [PATCH 4/8] change switch default to true, and add switch status to
 telemetry

---
 src/analytics.ts                              | 47 +++++++++----------
 src/lib/analyticsApi.ts                       |  2 +-
 .../startwork/startWorkWebviewController.ts   |  2 +-
 .../atlascode/startwork/StartWorkPage.tsx     |  2 +-
 src/vscAnalyticsApi.ts                        |  4 +-
 src/webviews/startWorkOnIssueWebview.ts       |  2 +-
 6 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/analytics.ts b/src/analytics.ts
index 071e77d6..6064d167 100644
--- a/src/analytics.ts
+++ b/src/analytics.ts
@@ -21,7 +21,7 @@ export const Registry = {
 };
 
 class AnalyticsPlatform {
-    private static nodeJsPlatformMapping = {
+    private static nodeJsPlatformMapping: Record<string, any> = {
         aix: 'desktop',
         android: 'android',
         darwin: 'mac',
@@ -107,8 +107,13 @@ export async function issueCommentEvent(site: DetailedSiteInfo): Promise<TrackEv
     return instanceTrackEvent(site, 'created', 'issueComment');
 }
 
-export async function issueWorkStartedEvent(site: DetailedSiteInfo): Promise<TrackEvent> {
-    return instanceTrackEvent(site, 'workStarted', 'issue');
+export async function issueWorkStartedEvent(
+    site: DetailedSiteInfo,
+    pushBranchToRemoteChecked: boolean,
+): Promise<TrackEvent> {
+    const attributesObject = instanceType({}, site);
+    attributesObject.attributes.pushBranchToRemoteChecked = pushBranchToRemoteChecked;
+    return instanceTrackEvent(site, 'workStarted', 'issue', attributesObject);
 }
 
 export async function issueUpdatedEvent(
@@ -164,7 +169,7 @@ export async function prCommentEvent(site: DetailedSiteInfo): Promise<TrackEvent
 }
 
 export async function prTaskEvent(site: DetailedSiteInfo, source: string): Promise<TrackEvent> {
-    const attributesObject: any = instanceType({}, site);
+    const attributesObject = instanceType({}, site);
     attributesObject.attributes.source = source;
     return trackEvent('created', 'pullRequestComment', attributesObject);
 }
@@ -657,33 +662,27 @@ function tenantOrNull<T>(e: Object, tenantId?: string): T {
     return newObj as T;
 }
 
-function instanceType(eventProps: Object, site?: DetailedSiteInfo, product?: Product): Object {
-    let attrs: Object | undefined = undefined;
-    const newObj = eventProps;
+function instanceType(
+    eventProps: Record<string, any>,
+    site?: DetailedSiteInfo,
+    product?: Product,
+): Record<string, any> {
+    eventProps.attributes = eventProps.attributes || {};
 
     if (product) {
-        attrs = { hostProduct: product.name };
+        eventProps.attributes.hostProduct = product.name;
     }
 
     if (site && !isEmptySiteInfo(site)) {
-        const instanceType: string = site.isCloud ? 'cloud' : 'server';
-        attrs = { instanceType: instanceType, hostProduct: site.product.name };
+        eventProps.attributes.instanceType = instanceType;
+        eventProps.attributes.hostProduct = site.product.name;
     }
 
-    if (attrs) {
-        newObj['attributes'] = { ...newObj['attributes'], ...attrs };
-    }
-
-    return newObj;
+    return eventProps;
 }
 
-function excludeFromActivity(eventProps: Object): Object {
-    const newObj = eventProps;
-
-    if (newObj['attributes']) {
-        newObj['attributes'] = { ...newObj['attributes'], ...{ excludeFromActivity: true } };
-    } else {
-        Object.assign(newObj, { attributes: { excludeFromActivity: true } });
-    }
-    return newObj;
+function excludeFromActivity(eventProps: Record<string, any>): Record<string, any> {
+    eventProps.attributes = eventProps.attributes || {};
+    eventProps.attributes.excludeFromActivity = true;
+    return eventProps;
 }
diff --git a/src/lib/analyticsApi.ts b/src/lib/analyticsApi.ts
index 32d51b76..76f5e9bb 100644
--- a/src/lib/analyticsApi.ts
+++ b/src/lib/analyticsApi.ts
@@ -12,7 +12,7 @@ export interface AnalyticsApi {
     fireIssueTransitionedEvent(site: DetailedSiteInfo, issueKey: string): Promise<void>;
     fireIssueUrlCopiedEvent(): Promise<void>;
     fireIssueCommentEvent(site: DetailedSiteInfo): Promise<void>;
-    fireIssueWorkStartedEvent(site: DetailedSiteInfo): Promise<void>;
+    fireIssueWorkStartedEvent(site: DetailedSiteInfo, pushBranchToRemoteChecked: boolean): Promise<void>;
     fireIssueUpdatedEvent(site: DetailedSiteInfo, issueKey: string, fieldName: string, fieldKey: string): Promise<void>;
     fireStartIssueCreationEvent(source: string, product: Product): Promise<void>;
     fireBBIssueCreatedEvent(site: DetailedSiteInfo): Promise<void>;
diff --git a/src/lib/webview/controller/startwork/startWorkWebviewController.ts b/src/lib/webview/controller/startwork/startWorkWebviewController.ts
index 67bc8b1b..894cfb11 100644
--- a/src/lib/webview/controller/startwork/startWorkWebviewController.ts
+++ b/src/lib/webview/controller/startwork/startWorkWebviewController.ts
@@ -143,7 +143,7 @@ export class StartWorkWebviewController implements WebviewController<StartWorkIs
                         branch: msg.branchSetupEnabled ? msg.targetBranch : undefined,
                         upstream: msg.branchSetupEnabled ? msg.upstream : undefined,
                     });
-                    this.analytics.fireIssueWorkStartedEvent(this.initData.issue.siteDetails);
+                    this.analytics.fireIssueWorkStartedEvent(this.initData.issue.siteDetails, msg.pushBranchToRemote);
                 } catch (e) {
                     this.logger.error(new Error(`error executing start work action: ${e}`));
                     this.postMessage({
diff --git a/src/react/atlascode/startwork/StartWorkPage.tsx b/src/react/atlascode/startwork/StartWorkPage.tsx
index 5664ec96..8c2aba4a 100644
--- a/src/react/atlascode/startwork/StartWorkPage.tsx
+++ b/src/react/atlascode/startwork/StartWorkPage.tsx
@@ -95,7 +95,7 @@ const StartWorkPage: React.FunctionComponent = () => {
 
     const [transitionIssueEnabled, setTransitionIssueEnabled] = useState(true);
     const [branchSetupEnabled, setbranchSetupEnabled] = useState(true);
-    const [pushBranchEnabled, setPushBranchEnabled] = useState(false);
+    const [pushBranchEnabled, setPushBranchEnabled] = useState(true);
     const [transition, setTransition] = useState<Transition>(emptyTransition);
     const [repository, setRepository] = useState<RepoData>(emptyRepoData);
     const [branchType, setBranchType] = useState<BranchType>(emptyPrefix);
diff --git a/src/vscAnalyticsApi.ts b/src/vscAnalyticsApi.ts
index eec8705e..ec466319 100644
--- a/src/vscAnalyticsApi.ts
+++ b/src/vscAnalyticsApi.ts
@@ -124,8 +124,8 @@ export class VSCAnalyticsApi implements AnalyticsApi {
         });
     }
 
-    public async fireIssueWorkStartedEvent(site: DetailedSiteInfo): Promise<void> {
-        return issueWorkStartedEvent(site).then((e) => {
+    public async fireIssueWorkStartedEvent(site: DetailedSiteInfo, pushBranchToRemoteChecked: boolean): Promise<void> {
+        return issueWorkStartedEvent(site, pushBranchToRemoteChecked).then((e) => {
             this._analyticsClient.sendTrackEvent(e);
         });
     }
diff --git a/src/webviews/startWorkOnIssueWebview.ts b/src/webviews/startWorkOnIssueWebview.ts
index 61288e0e..d73a0d58 100644
--- a/src/webviews/startWorkOnIssueWebview.ts
+++ b/src/webviews/startWorkOnIssueWebview.ts
@@ -132,7 +132,7 @@ export class StartWorkOnIssueWebview
                                         : ''
                                 }</ul>`,
                             });
-                            issueWorkStartedEvent(issue.siteDetails).then((e) => {
+                            issueWorkStartedEvent(issue.siteDetails, e.pushBranchToRemote).then((e) => {
                                 Container.analyticsClient.sendTrackEvent(e);
                             });
                         } catch (e) {

From f51751d82d45cbb71754690d6e44e7786749a136 Mon Sep 17 00:00:00 2001
From: Marco Mura <mmura@atlassian.com>
Date: Thu, 20 Feb 2025 22:41:05 -0800
Subject: [PATCH 5/8] fix copy/paste bug

---
 src/analytics.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/analytics.ts b/src/analytics.ts
index 6064d167..ca92649e 100644
--- a/src/analytics.ts
+++ b/src/analytics.ts
@@ -674,7 +674,7 @@ function instanceType(
     }
 
     if (site && !isEmptySiteInfo(site)) {
-        eventProps.attributes.instanceType = instanceType;
+        eventProps.attributes.instanceType = site.isCloud ? 'cloud' : 'server';
         eventProps.attributes.hostProduct = site.product.name;
     }
 

From 78fdba9a70f5710718d8366ca72b9925aea7962e Mon Sep 17 00:00:00 2001
From: Marco Mura <mmura@atlassian.com>
Date: Thu, 20 Feb 2025 23:39:42 -0800
Subject: [PATCH 6/8] small fix and unit tests

---
 src/analytics.test.ts | 106 ++++++++++++++++++++++++++++++++++++++++++
 src/analytics.ts      |   4 +-
 2 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 src/analytics.test.ts

diff --git a/src/analytics.test.ts b/src/analytics.test.ts
new file mode 100644
index 00000000..fe738745
--- /dev/null
+++ b/src/analytics.test.ts
@@ -0,0 +1,106 @@
+import { viewScreenEvent } from './analytics';
+
+interface MockedData {
+    getFirstAAID_value?: boolean;
+}
+
+const mockedData: MockedData = {};
+
+jest.mock('./container', () => ({
+    Container: { siteManager: { getFirstAAID: () => mockedData.getFirstAAID_value } },
+}));
+
+function setProcessPlatform(platform: NodeJS.Platform) {
+    Object.defineProperty(process, 'platform', {
+        value: platform,
+        writable: false,
+    });
+}
+
+describe('viewScreenEvent', () => {
+    const originalPlatform = process.platform;
+
+    beforeAll(() => {
+        setProcessPlatform('win32');
+    });
+
+    beforeEach(() => {
+        mockedData.getFirstAAID_value = true;
+    });
+
+    afterAll(() => {
+        setProcessPlatform(originalPlatform);
+    });
+
+    it('should create a screen event with the correct screen name', async () => {
+        const screenName = 'testScreen';
+        const event = await viewScreenEvent(screenName);
+        expect(event.name).toEqual(screenName);
+        expect(event.screenEvent.attributes).toBeUndefined();
+    });
+
+    it('should exclude from activity if screen name is atlascodeWelcomeScreen', async () => {
+        const screenName = 'atlascodeWelcomeScreen';
+        const event = await viewScreenEvent(screenName);
+        expect(event.screenEvent.attributes.excludeFromActivity).toBeTruthy();
+    });
+
+    it('should include site information if provided (cloud)', async () => {
+        const screenName = 'testScreen';
+        const site: any = {
+            id: 'siteId',
+            product: { name: 'Jira', key: 'jira' },
+            isCloud: true,
+        };
+        const event = await viewScreenEvent(screenName, site);
+        expect(event.screenEvent.attributes.instanceType).toEqual('cloud');
+        expect(event.screenEvent.attributes.hostProduct).toEqual('Jira');
+    });
+
+    it('should include site information if provided (server)', async () => {
+        const screenName = 'testScreen';
+        const site: any = {
+            id: 'siteId',
+            product: { name: 'Jira', key: 'jira' },
+            isCloud: false,
+        };
+        const event = await viewScreenEvent(screenName, site);
+        expect(event.screenEvent.attributes.instanceType).toEqual('server');
+        expect(event.screenEvent.attributes.hostProduct).toEqual('Jira');
+    });
+
+    it('should include product information if provided', async () => {
+        const screenName = 'testScreen';
+        const product = { name: 'Bitbucket', key: 'bitbucket' };
+        const event = await viewScreenEvent(screenName, undefined, product);
+        expect(event.screenEvent.attributes.hostProduct).toEqual('Bitbucket');
+    });
+
+    it('should set platform based on process.platform (win32)', async () => {
+        setProcessPlatform('win32');
+        const screenName = 'testScreen';
+        const event = await viewScreenEvent(screenName);
+        expect(event.screenEvent.platform).toEqual('windows');
+    });
+
+    it('should set platform based on process.platform (darwin)', async () => {
+        setProcessPlatform('darwin');
+        const screenName = 'testScreen';
+        const event = await viewScreenEvent(screenName);
+        expect(event.screenEvent.platform).toEqual('mac');
+    });
+
+    it('should set platform based on process.platform (linux)', async () => {
+        setProcessPlatform('linux');
+        const screenName = 'testScreen';
+        const event = await viewScreenEvent(screenName);
+        expect(event.screenEvent.platform).toEqual('linux');
+    });
+
+    it('should set platform based on process.platform (aix)', async () => {
+        setProcessPlatform('aix');
+        const screenName = 'testScreen';
+        const event = await viewScreenEvent(screenName);
+        expect(event.screenEvent.platform).toEqual('desktop');
+    });
+});
diff --git a/src/analytics.ts b/src/analytics.ts
index ca92649e..12af6efa 100644
--- a/src/analytics.ts
+++ b/src/analytics.ts
@@ -667,13 +667,13 @@ function instanceType(
     site?: DetailedSiteInfo,
     product?: Product,
 ): Record<string, any> {
-    eventProps.attributes = eventProps.attributes || {};
-
     if (product) {
+        eventProps.attributes = eventProps.attributes || {};
         eventProps.attributes.hostProduct = product.name;
     }
 
     if (site && !isEmptySiteInfo(site)) {
+        eventProps.attributes = eventProps.attributes || {};
         eventProps.attributes.instanceType = site.isCloud ? 'cloud' : 'server';
         eventProps.attributes.hostProduct = site.product.name;
     }

From 01d48f62c338b9514bb68d08c948cd27ecf04f80 Mon Sep 17 00:00:00 2001
From: Marco Mura <mmura@atlassian.com>
Date: Fri, 21 Feb 2025 00:19:48 -0800
Subject: [PATCH 7/8] Updated CHANGELOG

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ddae8ec..fca66880 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## What's new in 3.4.8
+
+### Features
+
+- Added a new toggle switch in 'Start work' page to choose if the new branch should be automatically pushed to remote.
+
 ## What's new in 3.4.7
 
 ### Features

From e9438d4887b3e5ae15fef1c42f916ae1f48e2dbe Mon Sep 17 00:00:00 2001
From: Marco Mura <mmura@atlassian.com>
Date: Fri, 21 Feb 2025 10:12:06 -0800
Subject: [PATCH 8/8] small improvements

---
 src/analytics.test.ts | 5 +----
 src/analytics.ts      | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/analytics.test.ts b/src/analytics.test.ts
index fe738745..eb3e23af 100644
--- a/src/analytics.test.ts
+++ b/src/analytics.test.ts
@@ -20,11 +20,8 @@ function setProcessPlatform(platform: NodeJS.Platform) {
 describe('viewScreenEvent', () => {
     const originalPlatform = process.platform;
 
-    beforeAll(() => {
-        setProcessPlatform('win32');
-    });
-
     beforeEach(() => {
+        setProcessPlatform('win32');
         mockedData.getFirstAAID_value = true;
     });
 
diff --git a/src/analytics.ts b/src/analytics.ts
index 12af6efa..95b5b907 100644
--- a/src/analytics.ts
+++ b/src/analytics.ts
@@ -21,7 +21,7 @@ export const Registry = {
 };
 
 class AnalyticsPlatform {
-    private static nodeJsPlatformMapping: Record<string, any> = {
+    private static nodeJsPlatformMapping: Record<NodeJS.Platform, string> = {
         aix: 'desktop',
         android: 'android',
         darwin: 'mac',
@@ -31,9 +31,11 @@ class AnalyticsPlatform {
         sunos: 'desktop',
         win32: 'windows',
         cygwin: 'windows',
+        haiku: 'unknown',
+        netbsd: 'unknown',
     };
 
-    static for(p: string): string {
+    static for(p: NodeJS.Platform): string {
         return this.nodeJsPlatformMapping[p] || 'unknown';
     }
 }